DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I9de870adde9e98ed02571337a7325f36c74e9983
Change-Id: Ica5b6142b110997558002ee522c3c37a6452bb24