DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I7956dc46f1d511a2670ce9e57034c06349761bc6
Change-Id: Ia10a4ff6abdd64181e9551ab38e55a517bdf7310