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

Change-Id: I1d829d50ddac42e8b6cc9c2fbe5d960978638c1a