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

Change-Id: Ie4bd674e3cce18ea055c5a46f2ed89f18aa27506