Merge "Make TYPE_VPN_LEGACY no longer deprecated."

core/api/module-lib-current.txt

@@ -98,7 +98,7 @@ package android.net {
   }
 
   public class VpnManager {
-    field @Deprecated public static final int TYPE_VPN_LEGACY = 3; // 0x3
+    field public static final int TYPE_VPN_LEGACY = 3; // 0x3
     field public static final int TYPE_VPN_NONE = -1; // 0xffffffff
     field public static final int TYPE_VPN_OEM = 4; // 0x4
     field public static final int TYPE_VPN_PLATFORM = 2; // 0x2

core/java/android/net/VpnManager.java

@@ -78,10 +78,8 @@ public class VpnManager {
 
     /**
      * An IPsec VPN created by the built-in LegacyVpnRunner.
-     * @deprecated new Android devices should use VPN_TYPE_PLATFORM instead.
      * @hide
      */
-    @Deprecated
     @SystemApi(client = MODULE_LIBRARIES)
     public static final int TYPE_VPN_LEGACY = 3;
 
@@ -418,4 +416,4 @@ public class VpnManager {
             throw e.rethrowFromSystemServer();
         }
     }
-}
+}