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

Change-Id: If4cf40e908b30267460687bfcbad77cb258b48c7