[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 68359af489 -s ours am: 4957268962
am: de7c26279d

Change-Id: Ie64cd7ef841a04618c207b776601b39a53f55384