Merge "Revert "Revert "Revert "Revert "Add VpnServiceBuilderShim for Vp..."" am: 29116813dd

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1938731

Change-Id: Ifb5471e7b97d23bf058cd81b8fe556235d0b191f

Android.bp

diff --git a/Android.bp b/Android.bp
index bf348a4..dd7e8c6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -50,7 +50,7 @@
 // have a different value depending on the branch.
 java_defaults {
     name: "NetworkStackNextEnableDefaults",
-    enabled: true,
+    enabled: false,
 }
 // This is a placeholder comment to avoid merge conflicts
 // as the above target may have different "enabled" values