Android R Beta 3
Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: Icd5c36a89ee87e7f501838d2be465b1da85ce6c3
Change-Id: I8ec452c9c9827cafa777afdf90ab2cc4a864637c