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

Bug: 139893257
Change-Id: I60b36656d0057704a1dd201d15d1db725dc6ad7c