DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Iacf6381bbe4781a8ce215647e7df401941424bda
Change-Id: Icc950d5b10b285f5a0a14bcafe2fe3e7d7d98aab