DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Ic9f990b25c38817d5108f436a7701da8de22d1d6
Change-Id: I9fdeda2defea048802a49b3926898d6468fe4337