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

Change-Id: I186b1928c9e9454b23ad7215ebb4b16b575dfe5c