DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I17602e470cf1600f0321a715dceff543c220b5f0
Change-Id: I9304edd92528fc5cdc3a05003e3baca1623ae7ad