DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I98cc04d82b9b4f971b15a170ef17d580ba524b40
Change-Id: Ib02cdb7a7c023c1f465d6672dcc43929ef826782