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

Change-Id: Ia047d50bf3edee30f317e01c7aa58f2ac9c483c7