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

Change-Id: Idd5777e89790e2f68129105eb3b78931e98af179