Merge "Re-add check for metered APNs regardless of IWLAN"

        // At this point, if data is not allowed, it must be because of the soft reasons. We

        // should start to check some special conditions that data will be allowed.

        if (!reasons.allowed()) {

            // If the device is on IWLAN, then all data should be unmetered. Check if the transport

            // is WLAN (for AP-assisted mode devices), or RAT equals IWLAN (for legacy mode devices)

            if (mTransportType == AccessNetworkConstants.TRANSPORT_TYPE_WLAN

                    || (mPhone.getTransportManager().isInLegacyMode()

                    && dataRat == ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN)) {

            // Check if the transport is WLAN ie wifi (for AP-assisted mode devices)

            if (mTransportType == AccessNetworkConstants.TRANSPORT_TYPE_WLAN) {

                reasons.add(DataAllowedReasonType.UNMETERED_APN);

            // Or if the data is on cellular, and the APN type is determined unmetered by the

            // configuration.