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

Change-Id: Ie8dd58afa0181299d90a7d29c81614a2efc2ac30