[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 5542cf6d82 -s ours
am: 019c07e27d

Change-Id: If74461bb92d3f913583348067fff3d761ea945c7