[automerger skipped] Fix CountMetricActiviationAndCondition CTS flake. am: 7cec098d8a am: 0ab7ca62e6 -s ours am: 413a96cb28 -s ours am: 624a95cefe -s ours

am skip reason: Merged-In Iad18701b9f51034e3db7f3b53674e6c870f59c5f with SHA-1 9bb2194946 is already in history

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

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