[automerger skipped] Fix CountMetricActiviationAndCondition CTS flake. am: 7cec098d8a am: 0ab7ca62e6 -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: I4cf3ddf946a37d7afca40e6e1674670d5d5d487f
Signed-off-by: Automerger Merge Worker <[email protected]>