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

Change-Id: I811d536c2708b8b2e540753ccca09d6cbe1b128f