Merge changes from topic "am-55d75601d34c4f5fbfd1d39bbc6de021" into android12-tests-dev

* changes:
  [automerger skipped] Merge "DO NOT MERGE Fix testSlicedStateCountMetricNoReset" into android11-tests-dev am: c3ef0facdc -s ours
  [automerger skipped] DO NOT MERGE Fix testSlicedStateCountMetricNoReset am: 6fb50efd5f -s ours