DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I507e5505ae6b418001a1602ba77bf4acc8cbb9cb
Change-Id: I528c0b8fc9e1ab983db177527ed951edf9029c9d