DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I2efd8b65312e25c5c96bf36b3c4a655baffe2eaa
Change-Id: I349fad5007e99ec4c02ba78a0c43a913ebba0fda