Snap for 8656240 from 51af85fe4a2b222108c426251a53e13daacf8110 to tm-release am: 49de4eafac

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/StatsD/+/18641459

Change-Id: Ica6aaef9d684b85b7fcb09a03cba66342299f552
Signed-off-by: Automerger Merge Worker <[email protected]>