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

Bug: 139893257
Change-Id: I0c9c640fe36f104f9812a6249509e1c086f6b551