Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev

Author: TreeHugger Robot

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

@@ -1138,7 +1138,7 @@ public void onUserRemoved(int userHandle) {
      */
     public synchronized void onUserStopped() {
         // Switch off networking lockdown (if it was enabled)
-        setLockdown(false);
+        setVpnForcedLocked(false);
         mAlwaysOn = false;
 
         unregisterPackageChangeReceiverLocked();