[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 37a9f381 -s ours am: 4e463dcc -s ours

am skip reason: Change-Id Ie00dbea32e074838466eeed00f316250c2b4f3c2 with SHA-1 85e21b3b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12484600

Change-Id: I0b52735f435b499380d502c157c11834739a7920