Merge "Disconnect EmergencyNumberTracker as the source of getNetworkCountryIso" am: ca71a36a88

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1624939

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b55a436c89ab21a5ba533678b0ccfb696643cb4