Merge "Add NEARBY_SERVICE constant shim" am: f354e20580

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

Change-Id: I105f40c9988b7d387d7237ad2e0bed2f21789cee

Android.bp

diff --git a/Android.bp b/Android.bp
index 6ddab41..d11bf8a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -52,7 +52,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