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

Bug: 139893257
Change-Id: I4758e749be0f3d0431664ed31e6d754953eb91a1