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

Change-Id: I85862ca421fdcf429345b0f4f0441591cf21ad74