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

Bug: 139893257
Change-Id: I1f48222b9d4c9e9275dfbf29d2f1e36044f1e9c2