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: I498ef776817176b00f19a1a2249c1a5c93c41254
tree: ad5fd66f970ad9812897b443b99de526aa0146b8
  1. tests/