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

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

Change-Id: Ie58484eb9ae29d32906f0f12929646fe9ab93592
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>