DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I4e02ba38f70d8358ae2e70a9920320e4b09f3d61
Change-Id: Id0fe95b3444297fb120155c4e27d76f02870b2fb