DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I96e0bd9743911ea4c8d29ab6306441f4e03ed809
Change-Id: I7fa4b95a33958ebbf1a57b422058074c5fc8c1dd