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

Bug: 139893257
Change-Id: I9d5d212b9b6b8abfdaaa123f65bfee5156115206