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

Bug: 139893257
Change-Id: I7e48b5477b2edda72c940e05531782dd28a2f784