[automerger skipped] Merge "Merge Android R...

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

am skip reason: Change-Id Ifca7b65f4e27bf14cdc30f72f790b0de90130bae with SHA-1 d786b6bf is in history

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

Change-Id: Iee0db93d879be0234d2aaa7301df8361aa4fe08c