DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history

Bug: 139893257
Change-Id: I3192a663f542955f012bcdcc42774624cc9e1891