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

Change-Id: I38ed28b07cb6b460cbcf91ab808d7120c0579df2