DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Ic9f996f0b5190c5451b8c6add9c7482903dbb485
Change-Id: Ia93bdc55d65694e0b62728f6783d217c49da6f5b