Fix CountMetricActiviationAndCondition CTS flake. am: 7cec098d8a am: 0695982eba am: 90dc56e9fb

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

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