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

Change-Id: Ib8d5be333c2d3f87580ed909e5d9a19bb671d44a