DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I1325e88711b3e467279ebcc168ddb20525b0388a
Change-Id: Iaa2b93e7bb9a01c54b1772ecd99476fab12dde2e