[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: 04ed38ed am: 05bf62a5 -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: I93107b5456c1b2f5df87ad59bce6c34d40795900