Android R Beta 3
Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I166f80c6b6820c5be6f8a1139176a8f149a5e753
Change-Id: I54a9295575522027e9ac2b855b1011fe9ac229d0