Merge changes I2169e251,If665f874 am: 49ae14bd69

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

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