Merge "Do not disconnect existing VPN if seamless handover fails"

            }

        } catch (RuntimeException e) {

            IoUtils.closeQuietly(tun);

            // If this is not seamless handover, disconnect partially-established network when error

            // occurs.

            if (oldNetworkAgent != mNetworkAgent) {

                agentDisconnect();

            }

            // restore old state

            mConfig = oldConfig;

            mConnection = oldConnection;