[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 77065af37d -s ours am: bdbcecf1ea -s ours am: afd45f574d -s ours am: eadcb6cedf -s ours

am skip reason: Change-Id Id9ba142af9d2da12bda66d0c376d4b8c13f1503b with SHA-1 18345a4cc9 is in history

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

Change-Id: I91d170a26b6fd17ea9ae384d1ef7e1de235367e9
tree: ebf5ff8eae1f14a3dc0fa852ca85f5c3f12986b9
  1. tests/