[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 0869bc39ad -s ours
am: 99713c39c7

Change-Id: Ia8c4077171e5da841ee89d7153fc2b4c52c938e9