[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: 996fbcab -s ours am: 54048def -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id2c75d5261b7f5d85222741354efcccc2146c51f