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

Bug: 139893257
Change-Id: I707303f7a60f23130fcb97a61f8757e4aad9e395