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

Change-Id: I73122856ef2c488510a6ebbd0a72f9b114f776d2