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

Bug: 139893257
Change-Id: Iec16ca66c6149d2502f0a3f5777e5137d5c52a99