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

Bug: 139893257
Change-Id: I68301176316ce555018b8a8f77c3c09c0a8df16e