Android R Beta 2
Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: Ib517ffb5d866fb61e9c97f25dd1a3de84a5d98bd
Change-Id: I9f00232ce655a816a413c290a79d395f2a5da135