[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: 3960aa56 -s ours am: 335b98dd -s ours am: 4664f4d8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I735c3456e898cc861b534ea006a45f2e320689a2