[automerger skipped] Merge "Hang up EmergencyDial after Trigger in VTS" into qt-dev am: 33e8a3668d -s ours
am: a4b9197e0b -s ours
am skip reason: change_id Iecba54b93b96d33b57bc59e00f082ff133d2e57b with SHA1 b2e7c71f39 is in history

Change-Id: I7fa18976b32ca1d2e34243760067fffc6434d91c