[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: b0c3d33c82 -s ours am: 59ebd79fa4
am: 3681597cfe

Change-Id: I05d48273c060e5f5015203bce8bcb22d2b6f443a