[automerger skipped] Merge "Fix TelMan#iccOpenLogicalChannel CTS test." into qt-dev
am: 4f841cbcda -s ours
am skip reason: change_id I2731ac491f83b23db84a27c51e998606ddadd6e1 with SHA1 efd506a146 is in history

Change-Id: Iae7a293721415e5322078afe79868292c56bb807