[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 77065af37d -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: I1f5cab852a75217ba6738a1c869692d076701401
tree: d19189f1aed7694e092a8ba3fc39b9aa1181f16d
  1. tests/