Merge "Hang up EmergencyDial after Trigger in VTS" into qt-dev
am: 33e8a3668d

Change-Id: I1f9738b608c9bfb6ea9d52b63c98cc6c57b1946d