Merge "Remove IWLAN exemption from getNetworkCountryIsoForPhone" am: 95672b6253

Change-Id: I894feaa4f92393dd8699066d594f192477a96678