DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I3d55c164ebb6879c95a89e0d19922b7fb0587e7d
Change-Id: Ia832afdc462a1f7631446a634d57e1a5f1acf48d