Snap for 13056741 from ff5d782e to busytown-mac-infra-release

Change-Id: Ie9dbc5dfe75da335e10719011ae816f36d626abb

current/Android.bp

@@ -41,10 +41,7 @@ prebuilt_bootclasspath_fragment {
 java_sdk_library_import {
     name: "framework-statsd",
     visibility: ["//visibility:public"],
-    apex_available: [
-        "com.android.os.statsd",
-        "test_com.android.os.statsd",
-    ],
+    apex_available: ["com.android.os.statsd"],
     licenses: ["statsd-module-sdk_Android-Apache-2.0"],
     shared_library: false,
     permitted_packages: [
@@ -82,10 +79,7 @@ java_sdk_library_import {
 java_import {
     name: "service-statsd",
     visibility: ["//visibility:public"],
-    apex_available: [
-        "com.android.os.statsd",
-        "test_com.android.os.statsd",
-    ],
+    apex_available: ["com.android.os.statsd"],
     licenses: ["statsd-module-sdk_Android-Apache-2.0"],
     jars: ["java_systemserver_libs/snapshot/jars/are/invalid/service-statsd.jar"],
     min_sdk_version: "30",
@@ -101,10 +95,7 @@ license {
 cc_prebuilt_library_shared {
     name: "libstatspull",
     visibility: ["//visibility:public"],
-    apex_available: [
-        "com.android.os.statsd",
-        "test_com.android.os.statsd",
-    ],
+    apex_available: ["com.android.os.statsd"],
     licenses: ["statsd-module-sdk_Android-Apache-2.0"],
     stl: "none",
     compile_multilib: "both",
@@ -137,10 +128,7 @@ cc_prebuilt_library_shared {
 cc_prebuilt_library_shared {
     name: "libstatssocket",
     visibility: ["//visibility:public"],
-    apex_available: [
-        "com.android.os.statsd",
-        "test_com.android.os.statsd",
-    ],
+    apex_available: ["com.android.os.statsd"],
     licenses: ["statsd-module-sdk_Android-Apache-2.0"],
     stl: "none",
     compile_multilib: "both",