Merge changes from topic "revert-2110246-revert-2108043-locallog-RHVOQAJCFV-GELQNRAIEE"

* changes:
  Make modules-utils-locallog available to platform
  Revert^2 "Convert filegroup to library"

core/java/Android.bp

@@ -146,11 +146,17 @@ java_library {
     ],
 }
 
-filegroup {
+java_library {
-    name: "framework-services-net-module-wifi-shared-srcs",
+    name: "modules-utils-locallog",
-    srcs: [
+    srcs: ["android/util/LocalLog.java"],
-        "android/util/LocalLog.java",
+    libs: ["unsupportedappusage"],
+    sdk_version: "module_current",
+    min_sdk_version: "30",
+    apex_available: [
+        "//apex_available:anyapex",
+        "//apex_available:platform",
     ],
+    visibility: ["//visibility:public"],
 }
 
 // keep these files in sync with the package/Tethering/jarjar-rules.txt and
@@ -375,15 +381,6 @@ filegroup {
     ],
 }
 
-// Avoid including Parcelable classes as we don't want to have two copies of
-// Parcelable cross the process.
-filegroup {
-    name: "framework-cellbroadcast-shared-srcs",
-    srcs: [
-        "android/util/LocalLog.java",
-    ],
-}
-
 java_library {
     name: "modules-utils-statemachine",
     srcs: [

services/net/Android.bp

@@ -35,7 +35,6 @@ java_library_static {
 java_library {
     name: "services.net-module-wifi",
     srcs: [
-        ":framework-services-net-module-wifi-shared-srcs",
         ":net-utils-services-common-srcs",
     ],
     sdk_version: "module_current",