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

Bug: 139893257
Change-Id: Ic4b3c78551512c22226bf2752687b473cc2c3d57