[automerger skipped] Merge "Hang up EmergencyDial after Trigger in VTS" into qt-dev
am: 33e8a366 -s ours
am skip reason: change_id Iecba54b93b96d33b57bc59e00f082ff133d2e57b with SHA1 07a53471 is in history
Change-Id: Iad4e837b9ee892ae9d35cc6a57788baab14a618e