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

Bug: 139893257
Change-Id: I4d6d59ed0c8259da7c0874988ef878e62a507356