DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Ib0738e77ae8422e61ba87c5600f8da4bc665ec94
Change-Id: Ic44f5cd5c1f1e04cde39dea7c59a3b7bb5ec263e