[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
am: 1ba485fbde -s ours
am skip reason: subject contains skip directive

Change-Id: I5048c3ee10b89fc2b94ad9b89a1c17d4a705b786