Merge \\\"Move \\\'is already always-on\\\' check into Vpn.java\\\" into nyc-dev am: 6a58c98cef am: b4f3bf969d

am: f99a160ca1

Change-Id: I525ebc4b6c27eff17ff57fac7f664c221cbc2954

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

@@ -3434,10 +3434,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
                 Slog.w(TAG, "User " + userId + " has no Vpn configuration");
                 return false;
             }
-            // If the current VPN package is the same as the new one, this is a no-op
-            if (TextUtils.equals(packageName, vpn.getAlwaysOnPackage())) {
-                return true;
-            }
             if (!vpn.setAlwaysOnPackage(packageName, lockdown)) {
                 return false;
             }