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

[automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: f2d4156f am: c847e318 -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: I308d5ffd773643410d45a069e4ffcb4cf6b8b375