Merge "Clear country ISO in both LocaleTracker and EmergencyNumberTracker in APM"