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

Bug: 139893257
Change-Id: If7acc22c05cd73fc1dd4e247fe1a009754f56301