Merge "Cleanup connections for APNs that are not connected"

                // request goes away.  This applies to both CDMA and GSM because they both

                // can declare the DUN APN sharable by default traffic, thus still satisfying

                // those requests and not torn down organically.

                if (apnContext.getApnType() == PhoneConstants.APN_TYPE_DUN && teardownForDun()) {

                if ((apnContext.getApnType() == PhoneConstants.APN_TYPE_DUN && teardownForDun())

                        || apnContext.getState() != DctConstants.State.CONNECTED) {

                    str = "Clean up the connection. Apn type = " + apnContext.getApnType()

                            + ", state = " + apnContext.getState();

                    if (DBG) log(str);

                    apnContext.requestLog(str);

                    cleanup = true;

                } else {

                    cleanup = false;