[automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: 93697f6149 am: 4bd8cd16bf -s ours am: b4bf18315a -s ours am: 1f21d904b3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I934d8a432d875e00ea08252a12a4b5f3441b6ee5