Merge "Disable always-on VPN in factoryReset" am: 9847e78b72 am: adb7a1c631 am: f6c57b8f2f

am: 5c709185ef

Change-Id: Iaccb7394994ccce66df0ab2f713fd890a8b999c8

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

@@ -5512,6 +5512,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) {