Merge "Disconnect EmergencyNumberTracker as the source of getNetworkCountryIso" am: ca71a36a88 am: e8e3a835e1 am: a90782f261 am: 34a34c8f1f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iea95fd4f96c1953fe1b4c7ca503608bc3406ef26