Merge "Disconnect EmergencyNumberTracker as the source of getNetworkCountryIso"