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

Bug: 139893257
Change-Id: I8e54cab8a57da639c333a3590cce3d9ef43b16dd