Merge "Implement getNetworkCountryIso in PhoneInterfaceManager."
am: 836b0c12dc

Change-Id: I18c1d97ee49b5fdfd31ccc6ee03306313ffd9887