DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: If560b4abba6e77df6c5b46e07c1d3a13ca422196
Change-Id: I40638a4c191756fecff5a2c1489214b0f5e44f60