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

Change-Id: I7c669633ce0eb0ebdf747d5471efe20f95d43ba7