DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Ie748edbcc64e5f2eaef5081fd507eceb63ce127a
Change-Id: I1b9ff95da40f5038a83af5c4f3e7529d47ea2b55