Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 48b18f4fa9 am: ef7e644fc5

am: 62f3b9286d

* commit '62f3b9286df6cd8361d967910b91c63916e931fd':
  Return legacy VPN info regardless of lockdown mode

Change-Id: Ifff21798ff23d1906810d23393efc3e0cad14941

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

@@ -3231,9 +3231,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
     @Override
     public LegacyVpnInfo getLegacyVpnInfo(int userId) {
         enforceCrossUserPermission(userId);
-        if (mLockdownEnabled) {
-            return null;
-        }
 
         synchronized(mVpns) {
             return mVpns.get(userId).getLegacyVpnInfo();