Android R Beta 3
Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I837dd43781e4688d084be8931ddf8a85531d3760
Change-Id: Id165b72e4b096dc5953f2b98141ae17aabaa6aaf