[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 9821df1b1f -s ours am: 8cabf84832 am: 2f464241a1
am: 3cbc718e81 -s ours
am skip reason: subject contains skip directive

Change-Id: Id7b63cbe38994253c5b1951f90fcd07eff21de7d