Merge "Add icon mapping for NETWORK_TYPE_IWLAN" into mnc-dev