DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: If503432e50038a142655879ffd12f5db46d97fb7
Change-Id: I002e88d857824f012dbd7d168071f06599c16bef