Merge changes from topics "CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED",...

                if (!VpnConfig.LEGACY_VPN.equals(mPackage)) {

                    mAppOpsManager.finishOp(

                            AppOpsManager.OPSTR_ESTABLISH_VPN_MANAGER, mOwnerUID, mPackage, null);

                    // The underlying network, NetworkCapabilities and LinkProperties are not

                    // necessary to send to VPN app since the purpose of this event is to notify

                    // VPN app that VPN is deactivated by the user.

                    // TODO(b/230548427): Remove SDK check once VPN related stuff are decoupled from

                    //  ConnectivityServiceTest.

                    if (SdkLevel.isAtLeastT()) {

                        sendEventToVpnManagerApp(VpnManager.CATEGORY_EVENT_DEACTIVATED_BY_USER,

                                -1 /* errorClass */, -1 /* errorCode*/, mPackage,

                                getSessionKeyLocked(), makeVpnProfileStateLocked(),

                                null /* underlyingNetwork */, null /* nc */, null /* lp */);

                    }

                }

                // cleanupVpnStateLocked() is called from mVpnRunner.exit()

                mVpnRunner.exit();