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

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

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