[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 skip reason: Change-Id I8f528401f4921cf51a7e0106e86f62b138ffc696 with SHA-1 983cf39a is in history

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

Change-Id: I5df4acb5fe340476b80a9e4f4c3f1f2db2d0f07d