[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: f676899b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I51e0f5d93cd564b17ba5c195021e6ff9034c0c8d