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

Change-Id: I53b9079ba3c0a09f08388ba564b6df5504cb6b6f