DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Iede8164e8b02f8136c10fdb53033d242d21723cb
Change-Id: Ie0423ea1be11932e3682a1a1e18c2e9aa692da75