Snap for 8929424 from 19abda9b338879ffe53a8e75fff9c2759dbb0d2c to mainline-art-release

Change-Id: I24c7e317b1d87e508e7fafb7061f1a6a4082aadb
diff --git a/Android.bp b/Android.bp
index 88e9b12..6090be2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -468,7 +468,6 @@
 
     apex_available: [
         "//apex_available:platform",
-        // TODO(b/151068271) switch this to //apex_available:anyapex
         "com.android.tethering",
         "com.android.wifi",
     ],
@@ -496,7 +495,6 @@
 
     apex_available: [
         "//apex_available:platform",
-        // TODO(b/151068271) switch this to //apex_available:anyapex
         "com.android.bluetooth",
     ],
 }
@@ -614,14 +612,7 @@
 
     apex_available: [
         "//apex_available:platform",
-        // TODO(b/151068271) switch below to //apex_available:anyapex
-        "com.android.permission",
-        "com.android.bluetooth",
-        "com.android.tethering",
-        "com.android.wifi",
-        "com.android.extservices",
-        "com.android.car.framework",
-        "com.android.uwb",
+        "//apex_available:anyapex",
     ],
 }