Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE

Merged-In: I921086d2b5b3a9a0a5b8d78109d28cccf6ff26fd
Change-Id: I5be609d7b7a0dc28486895c4ab772720eb7fe10a