Merge "Ensure external calls are not logged." into nyc-mr1-dev

        // 1) It was not in the "choose account" phase when disconnected

        // 2) It is a conference call

        // 3) Call was not explicitly canceled

        // 4) Call is not an external call

        if (isNewlyDisconnected &&

                (oldState != CallState.SELECT_PHONE_ACCOUNT &&

                 !call.isConference() &&

                 !isCallCanceled)) {

                 !isCallCanceled) &&

                !call.isExternalCall()) {

            int type;

            if (!call.isIncoming()) {

                type = Calls.OUTGOING_TYPE;