[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 85103c3ebd -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: I3014d38723598bca879baffb9e71e0b0fd160981