[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: a289cd65b9 -s ours am: 65fe4d02a8 am: 3cd0fbc94c
am: 2ed5fb7c1f -s ours
am skip reason: subject contains skip directive

Change-Id: Idc7a294ad0c2b32f5b8200f807a03e9f956a8756