DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Id2d9c4f56beae280e6299b6695185577a1521345
Change-Id: Ice3069b89e1a47121d1920aa3e45fbddbed5678e