DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I87d81caed692fccb99d72301f4887876256d80d3
Change-Id: I83fbe41ef40e2c4ed82e002e9cefb9b4f3d4a8e7