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

Bug: 139893257
Change-Id: I43a40bdec58806d2238cb937203d4fa67b8f001d