Merge "Revert "Implement getNetworkCountryIso in PhoneInterfaceManager.""