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

Merged-In: I0ff9ff4992dc17879d3cc67ebf3113bee47c1cf9
Change-Id: I46eb801f7b622cc34e117df8e30e6bba0838a93c