Snap for 10102166 from ba063191e3473e773229ae1ec5edeaf6b91762d5 to mainline-tzdata4-release

Change-Id: Ic28deaa2d380c1d5bda54452b45f7e0fb8d39c84
diff --git a/Android.bp b/Android.bp
index 3386f9d..bf8032e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,8 +40,8 @@
     min_sdk_version: "30",
     sdk_version: "core_current",
     apex_available: [
+        "//apex_available:anyapex",
         "//apex_available:platform",
-        "com.android.adservices",
     ],
 }
 
@@ -57,9 +57,6 @@
     libs: [
         "android.test.base",
     ],
-    test_mainline_modules: [
-        "com.google.android.adservices.apex"
-    ],
     min_sdk_version: "30",
     sdk_version: "test_current",
     test_suites: [