Merge cherrypicks of ['googleplex-android-review.googlesource.com/24184305'] into udc-release. am: 8d5ec2e59a

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

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