DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I336f2eca214c611698cc1b536e7ff80c800b397a
Change-Id: I139c4c62c9b05937aabb48bc9b4bcf001044fed3