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

Bug: 139893257
Change-Id: I54b340294458df6016b7893838e1b0f6e61daf11