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

Change-Id: I9ddb6c48348c64ee9be1361df16073947e89fff5