DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I87e7d3eb3d44441f9415c38cd2df7d1c66a3e9f0
Change-Id: Ifd234ceed2e137f5c9dee34d0fb254be6150dc21