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

Change-Id: I10a98fb8d649e4f1fe7e6ccf9b330ceae76dd247