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

am skip reason: subject contains skip directive

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

Change-Id: I50224cf6198d5dd81cdc0737ea014b70c10da468
tree: ffb9d1b3619ac7db5997d02fec7904d56351397e
  1. tests/