DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I9cd544292abc85430a234bede371e4f4010848b6
Change-Id: Iabdd45a1098b9f1bf84ee8a13ce7b1ee02b0a49b