DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Ibac700f8e331206d7ae55e3b8f6c691c98631b88
Change-Id: Idee8b0ae754101ee1a3dfc76f6ad5bbe0fab7af9