DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Ide0ea0f95c6b4ed26e57a813af9b18df722a9d50
Change-Id: I96d8039114275cf5311f97fcfc2636e08891147a