Merge "Revert "Implement getNetworkCountryIso in PhoneInterfaceManager."" am: 5ee1cc6abe
am: 92245009d0

Change-Id: Ie3ac5cb805f9652f65c901674ebabbe4d32e7b3a