Merge "Add a new parameter to emergencyDial()."
am: 685fcc0098

Change-Id: I4c6023c8dd8571659afdb2e7ad7ab6854e1b47ad