Snap for 7132927 from 7cb3e5004c6db8db233d7b03b8ca1105e8ef7928 to mainline-documentsui-release

Change-Id: Icad9f57db766d8d34b3a94f605cc51fe2a7acd39
diff --git a/server/Android.bp b/server/Android.bp
index db9ae82..36ad42c 100644
--- a/server/Android.bp
+++ b/server/Android.bp
@@ -1,3 +1,17 @@
+java_library {
+    name: "netd_aidl_interface-lateststable-java",
+    sdk_version: "system_current",
+    static_libs: [
+        "netd_aidl_interface-java",
+    ],
+    apex_available: [
+        "//apex_available:platform", // used from services.net
+        "com.android.bluetooth.updatable",
+        "com.android.tethering",
+        "com.android.wifi",
+    ],
+}
+
 aidl_interface {
     name: "netd_aidl_interface",
     local_include_dir: "binder",
@@ -26,6 +40,8 @@
                 "com.android.tethering",
                 "com.android.wifi",
             ],
+            // this is part of updatable modules(NetworkStack) which targets 29(Q)
+            min_sdk_version: "29",
         },
     },
     versions: [
@@ -36,6 +52,20 @@
     ],
 }
 
+java_library {
+    name: "netd_event_listener_interface-lateststable-java",
+    sdk_version: "system_current",
+    static_libs: [
+        "netd_event_listener_interface-java",
+    ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.bluetooth.updatable",
+        "com.android.wifi",
+        "com.android.tethering",
+    ],
+}
+
 aidl_interface {
     name: "netd_event_listener_interface",
     local_include_dir: "binder",