Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: 2c67d7f24a

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

Change-Id: I2a77e6a9e5246800149980d33b19fca17fc687b6