Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: f2d4156f5b

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

Change-Id: I8a4f97f07e021357299d524adbd155a4ea453588