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

Bug: 139893257
Change-Id: I8598cdf4271250b1d8e32c7852b548ad26fc0fb7