DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Idddda38e3277fe33216d1de782bcfe43cebc5bfb
Change-Id: I53edff08d3d2c4fcdef4a7110b04321f59f9470b