DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Ia51c5b73ab275d41e8bc478d15ca892a644615bd
Change-Id: I6b5f5bbd6158c74d12d1eb5f961b4093e817a015