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

Bug: 139893257
Change-Id: Ida2361eb8b3842f52876c465dbbe0d8ad86f7204