Merge "Fix testSlicedStateCountMetric on certain devices." into stage-aosp-rvc-ts-dev am: 06875173a7 am: 1301cd7ea2 am: 7951054421

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

Change-Id: I05d0ca155c3b3161c371b78efb179caec867a5a8
tree: ad5fd66f970ad9812897b443b99de526aa0146b8
  1. tests/