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

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

Change-Id: I87a29872797143c8904630345e96e856f1749a2b
tree: 3f592a3ba803c2586f94b0c5066fa26d4129de0e
  1. tests/