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

Change-Id: Ibc08365a60aeffb8b183748a86fa5894be797ae6