DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Ibc15a90266d1f30174d6590a157571507e8ee31a
Change-Id: I279c3cc3cfcf8e6c28b3cddf98fee6e47f4b46a5