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

Change-Id: I03c4a53606466438452dd2ff3590fce0e877e78e