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

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

Change-Id: I57ad509ca0a7ef5c860a89c830746ed9898fc79b