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

Bug: 139893257
Change-Id: I89559c14cbc17c47f9b43754ec44904b19c73dd3