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

[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: 2c67d7f2 am: e666aa1e -s ours

am skip reason: Change-Id Ic1e07d28a41eea2ce59cc21702dae95d61adc24e with SHA-1 0c5a020a is in history

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

Change-Id: If6eb17c8b328ea801a2825e93391a9bd21925072