Remove unused filegroup

The library in frameworks/base now uses the java_library defined here.

Whilst here, also mark the library as available to wifi.

Test: m com.android.wifi
Change-Id: I36047413c749df3cabb7b284444a6f60494d3bb1
diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index e0b75c5..857b7c2 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -260,24 +260,15 @@
     ],
     lint: { strict_updatability_linting: true },
 }
-filegroup {
-    name: "net-utils-services-common-srcs",
+
+java_library {
+    name: "net-utils-services-common",
     srcs: [
         "device/android/net/NetworkFactory.java",
         "device/android/net/NetworkFactoryImpl.java",
         "device/android/net/NetworkFactoryLegacyImpl.java",
         "device/android/net/NetworkFactoryShim.java",
     ],
-    visibility: [
-        "//frameworks/base/services/net",
-    ],
-}
-
-java_library {
-    name: "net-utils-services-common",
-    srcs: [
-        ":net-utils-services-common-srcs",
-    ],
     sdk_version: "module_current",
     min_sdk_version: "30",
     static_libs: [
@@ -292,6 +283,7 @@
         "//apex_available:platform",
         "com.android.bluetooth",
         "com.android.tethering",
+        "com.android.wifi",
     ],
     visibility: [
         // TODO: remove after NetworkStatsService moves to the module.