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

am: b4f3bf969d

Change-Id: I897c48083f8e6786182d023c58f9861996c6d25c

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

@@ -3431,10 +3431,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;
             }