Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev

am: 48b18f4fa9

* commit '48b18f4fa994e201e3eb4cca1e7c823b198359c5':
  Return legacy VPN info regardless of lockdown mode

Change-Id: I202f19946246aa52d37c3c6bb7665cc58ddf8572

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

@@ -3228,9 +3228,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();