Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6 am: a2a586a am: d29dc3d am: e7069bc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135

Change-Id: I0b180698048fb1c643d90f2d038d1df8d66fc671

Author: TreeHugger Robot

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

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