Merge "Fix CountMetricActiviationAndCondition CTS flake." into main am: c9983b6739

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

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