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

Merged-In: I6d7f94fdb0a7d123d7c9ef80276cb6f9efa81977
Change-Id: Iac3738fbb125e0ccad26c8aa9e69d46122e29f96