DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I58d2f9a884cf29bf1e05ea0dc3f9e3220e4d325f
Change-Id: I1c5ee03cc022bb0dbc4d58fea0dd7d18b230b230