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

Bug: 139893257
Change-Id: I6b1f9a02b7b2170b475ed03351e9466042d437e5