[automerger skipped] Fix CountMetricActiviationAndCondition CTS flake. am: 7cec098d8a am: 0ab7ca62e6 am: 0894c86d66 -s ours

am skip reason: Merged-In Iad18701b9f51034e3db7f3b53674e6c870f59c5f with SHA-1 7cec098d8a is already in history

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

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