DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I6a342cfc998c6dd81fced0a70771c5b00f77a881
Change-Id: I6a68d7b945ff149f7bb09609ee3232bc19cdd19a