Merge "Implement getNetworkCountryIso in PhoneInterfaceManager." am: 836b0c12dc am: 6167fa49cb
am: fce46e6041  -s ours

Change-Id: I56700a339880d3d4152a8a8ff7f4eab78a9eefd5