DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I2e739d3606ba9f0938ebc2363cb9443ec3dec912
Change-Id: I2e0af6e3fc539ee2d010d1638a324f8cd33934a1