Cherrypicking to android14-tests-dev am: 29a3b2c47c am: 65614a7103 am: 8ec82fdafa

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

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