[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
am: 7748102af1 -s ours
am skip reason: subject contains skip directive

Change-Id: I1229451d40fb142f3f46e591e1dadc652b232685