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

am: c32921dcda

Change-Id: I6532f2e654cfd9df8ee6c649344b0b915a8381c1

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;
             }