[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 85103c3ebd -s ours am: 61d776b42a -s ours

am skip reason: Change-Id I37a77cdaf905fe0bf58ad8eebcdff36873aec71a with SHA-1 6f5993af4f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12469994

Change-Id: Ic902b798b9916de7a8c5924588f371e93a2b1852