Android R Beta 3
Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: Id26c2683062d89569dc7d62c8acb9fe84d257610
Change-Id: I873022a1292a86a33f65adc7cd07983cc034f48e