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

Change-Id: Ife0b2479362b4554c891fe6be42defbe3f15d427