[automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT...

[automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: 93697f61 am: 4bd8cd16 -s ours am: b4bf1831 -s ours

am skip reason: Change-Id I5df4acb5fe340476b80a9e4f4c3f1f2db2d0f07d with SHA-1 335b98dd is in history

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

Change-Id: I02777738b42e976b249076cd9dc9a32d5694d708