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

Bug: 139893257
Change-Id: I66f361cc1a3790120c518d001934a6c910c58526