[automerger skipped] Merge "Add a new parameter to emergencyDial()." am: 685fcc0098 am: b560d1958e
am: bb51338079 -s ours
am skip reason: change_id Ic830762d8a8319f494f22d875ca6adad91ffce3b with SHA1 143d32860f is in history

Change-Id: Iea31394871fb066eea56bda817717f73fba05fff