DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I352101d8fd2d8815109498778ba9417becbe98cb
Change-Id: Ia4eb9ba60ede2c4a6c3a7305ea46a692c8d95001