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

Change-Id: I06d6df838973eb83189777450cad9759d696ca40