DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I76dcd53e645f15496c562e1b3218715ad85c4a25
Change-Id: Ic5170db27b6c06090cfcd1e961fdd6d5e981e673