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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic745a5e70958bb488efdf5d07a245dcb489ca490