[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: 2c67d7f24a am: e666aa1e3d -s ours am: 64363d8b8d -s ours am: d58cc389e4 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487068

Change-Id: Ie9a9c0b904a7491a785cdb40dbf2225977a409d7