Merge "Revert "Implement getNetworkCountryIso in PhoneInterfaceManager."" am: 5ee1cc6abe am: 92245009d0
am: 1deeea0a18  -s ours

Change-Id: Icd30c977565840d3e1e31e4b30698adf36438c1e