DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I9fa27f3fe37a1739598044d29b48c3f39ebe1c98
Change-Id: Ie9e988f9f46bd4e65f7a2b27c7d346065d437642