[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
am: bc7898323c -s ours
am skip reason: subject contains skip directive

Change-Id: Ibce509308710e29ac01e64d5a3194460d69eabc1