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

Bug: 139893257
Change-Id: Ib69c986e30b903cc48ca835fb307acf569930806