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

Bug: 139893257
Change-Id: I5aec554e8bd66f8ec97bc5d1853214bae43fdb6c