Merge "Attempt to de-flake testSlicedStateCountMetric" into stage-aosp-rvc-ts-dev am: a9fa82628c am: 4620a3f656 am: 0e5a6544c1 am: 5d929caf23 am: 3fda22f159

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12354196

Change-Id: I5f39cd0b4f1de9603c3b4a07c0bb6277a7fae5d2