[automerger skipped] Merge "Hang up EmergencyDial after Trigger in VTS" into qt-dev am: 33e8a3668d am: 69e3ccf31e -s ours
am: 22e824a13d -s ours
am skip reason: change_id Iecba54b93b96d33b57bc59e00f082ff133d2e57b with SHA1 07a53471c4 is in history

Change-Id: Iadc6b5e921bdbf6f68a3a65e25674a51132a984d