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

Bug: 139893257
Change-Id: I760b21ca5c15067de39e3d9963041c05ce7121db