[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to...

[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 7a4e6a9b -s ours

am skip reason: Change-Id I6fac0ea9a1815b005e0735844b7100043099a975 with SHA-1 47767ebd is in history

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

Change-Id: Ic389257b85be2fe84ac2509810c5ef8d94b61f4b