[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 skip reason: Change-Id Ic1e07d28a41eea2ce59cc21702dae95d61adc24e with SHA-1 0c5a020adc is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1487068
Change-Id: Iaeedaf3983f8e900a5ac08c74eed21809954e1e3
This commit is contained in: