[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 2bcf2aad9f -s ours am: cf2a8c6ead -s ours

am skip reason: Change-Id I7ef0979ffed7d218de1e68c428c97cedea180059 with SHA-1 0c047bdf22 is in history

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

Change-Id: I9e4ea94faa84a946beb5cc69d067589e8facee47
tree: d19189f1aed7694e092a8ba3fc39b9aa1181f16d
  1. tests/