DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Ic5d5f90678ed7d8636ffd5324a4d6609e0ae3d1a
Change-Id: Iec59310e42364bc3a11165aee99dc16dc92467d4