Merge "Disconnect ongoing calls for emergency based on CarrierConfig"
am: 48df7efe49

Change-Id: Ifca429f5dbe68ec486712c8a005c3829f27ad047