Merge "Add support for disconnecting outgoing calls for emergency calls"
am: 252fcc7b27

Change-Id: I0f3d0a651b69e76de0ba3f3a473bd5bcbb4c4d35