Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1

services/java/com/android/server/connectivity/Vpn.java

@@ -482,6 +482,7 @@ public class Vpn extends INetworkManagementEventObserver.Stub {
                 if (state.exists()) {
                     throw new IllegalStateException("Cannot delete the state");
                 }
+                new File("/data/misc/vpn/abort").delete();
 
                 // Check if we need to restart any of the daemons.
                 boolean restart = false;