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

Change-Id: I588f15fd76f6bb1b863c612aa8f896be098317f4