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

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

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