DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I913ff04a6c4568c0326866fd4462fb25f4eb317b
Change-Id: I37ea7f1c62d7e1d7c772b2aa92f68b2c369f4165