Merge "Disable always-on VPN in factoryReset" am: 5765604627 am: 7960c6b8b5

am: 495418cd9c

Change-Id: I99207281321861a3e720b5c1e2e316e12b104677

services/core/java/com/android/server/ConnectivityService.java

@@ -5501,6 +5501,18 @@ public class ConnectivityService extends IConnectivityManager.Stub
                 }
             }
 
+            // Turn Always-on VPN off
+            if (mLockdownEnabled && userId == UserHandle.USER_SYSTEM) {
+                final long ident = Binder.clearCallingIdentity();
+                try {
+                    mKeyStore.delete(Credentials.LOCKDOWN_VPN);
+                    mLockdownEnabled = false;
+                    setLockdownTracker(null);
+                } finally {
+                    Binder.restoreCallingIdentity(ident);
+                }
+            }
+
             // Turn VPN off
             VpnConfig vpnConfig = getVpnConfig(userId);
             if (vpnConfig != null) {