DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Ia0b1c53b5b58c067e86805a34e358081831dc792
Change-Id: Iae7bc0dab3c6bb3aad560377b9159ec8621fbd73