DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Ib835c1a54cd5818832bb4ed51128c86a32591ea1
Change-Id: If40fd7d1628dc665a582b26c5d36f0c7da7da074