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

Bug: 139893257
Change-Id: I66cfa981a2859f87c4ac60f04c9c46417a08757b