[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: 04ed38edc9 am: 05bf62a5f9 -s ours am: 6c179b0318 -s ours am: 4134c8b4d9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib9ed26f36395d7d1696903983c00c57ec3a34931