[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: 7ff2eff0 -s ours am: 69b8dea3 -s ours

am skip reason: Change-Id I921086d2b5b3a9a0a5b8d78109d28cccf6ff26fd with SHA-1 d947f25a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12984798

Change-Id: I59dfaa5577447890571cabce77fb2f47c4ee1c9e