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

Bug: 139893257
Change-Id: Ieac936684dd0f833931ae5bcb57405830eee972c