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

Bug: 139893257
Change-Id: Ic2dc4f1e3e76381e58ae3345f337779f96809dce