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

Change-Id: Ie5913f2ea1327113ae9370223d6cc5d0bc7c537a