[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 1acb5e534b -s ours am: 68f846f348
am: b4fd6fdbe4

Change-Id: Ibdcb7e3a302536b45b9d78791be5970a9808a50a