Merge changes from topic "fix-module-visibility" into sc-dev am: c97307a0ec

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14717312

Change-Id: I1b206adf121c95a4c6996669cd9506b3f55556cd

apex/media/service/Android.bp

@@ -23,10 +23,10 @@ package {
 filegroup {
     name: "service-media-s-sources",
     srcs: [
-      "java/**/*.java",
+        "java/**/*.java",
     ],
     path: "java",
-    visibility: ["//frameworks/base/services"], // TODO(b/177640454): Should be private.
+    visibility: ["//visibility:private"],
 }
 
 java_sdk_library {

services/Android.bp

@@ -72,17 +72,6 @@ filegroup {
     visibility: ["//visibility:private"],
 }
 
-filegroup {
-    name: "services-all-sources",
-    srcs: [
-        ":services-non-updatable-sources",
-        ":service-media-s-sources",
-        ":service-permission-sources",
-        ":service-statsd-sources",
-    ],
-    visibility: ["//visibility:private"],
-}
-
 java_library {
     name: "Slogf",
     srcs: ["core/java/com/android/server/utils/Slogf.java"],