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

Change-Id: I39cc78090d321d0d9bd305dc7c6e9fc6d0df60ce