DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I4fa07b3ba54d994e87a5fa67e9f4e5a0d4d4b28c
Change-Id: I3c36c5cd1bbc665fb845f95b9cdc5a0655ee8bb5