DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I47caff651827119801e9151b9a4954061f169553
Change-Id: If6cd64317773108fd0f559fd7d7ce1b907db0117