[automerger skipped] Fix CountMetricActiviationAndCondition CTS flake. am: 7cec098d8a am: 0695982eba am: 20ab7db460 -s ours am: 81d2becb20 -s ours am: 46b103232c -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: I17a30e7817a371625fe4e4f4c16ea03de5bbe8c0
Signed-off-by: Automerger Merge Worker <[email protected]>