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

Change-Id: I6a9dcb6534b2a00883aa58f0efc696cb501482f8