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

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1486848

Change-Id: I1ebc0e767beb6c1e3f8dab06645b07c42cfeed40