Merge "Hang up EmergencyDial after Trigger in VTS" into qt-r1-dev
am: a8baf71318

Change-Id: Icf6923943071b066341cfcdb16e97e0f8ac9c1a4