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

Bug: 139893257
Change-Id: I5c31191da0b5afcb74323bba41285593b23da89d