DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I768a7f6ad34340864cab5296d946536401fb2f1e
Change-Id: I82cba4441cf53a0efdfd7de261ccf16b6ff92742