DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Icc53c3188ddda7da98959ef439105f33fe49ed62
Change-Id: Id525d2b9f8f438ad16147a497469cccf1cb1301a