DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Ia239a6ba82bf17b2a80bdc734646123a9afb85bb
Change-Id: I54ee939e60b0ab2953c2267230b1401375ad13d9