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

Bug: 139893257
Change-Id: I3ba2b411ab78b6e4165d304b4328400dbd6ac024