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

Bug: 139893257
Change-Id: I0da7d0b96d36420a99f8727abec5ee8e6e45ac37