DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I52bfb3e6c7fb46fe70046a0db9b1c0de41a643e1
Change-Id: I49ab67ab08c920dd84bed21e02a8593f0f7879f7