DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I82b606f10035eae94aeb06f41070068ec1ec0ca3
Change-Id: Ibe54a05302d18a7ed00b7d823daa708a6abdd3f8