diff --git a/Android.bp b/Android.bp
index dd26dda15f5..619a390d8b8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -56,6 +56,7 @@ android_library {
         "androidx.cardview_cardview",
         "androidx.preference_preference",
         "androidx.recyclerview_recyclerview",
+        "androidx.window_window",
         "com.google.android.material_material",
         "setupcompat",
         "setupdesign",
@@ -75,7 +76,6 @@ android_library {
         "android.hardware.dumpstate-V1.1-java",
         "lottie",
         "WifiTrackerLib",
-        "windowExtLib",
         "SettingsLibActivityEmbedding",
     ],
 
@@ -105,10 +105,6 @@ android_app {
     ],
     static_libs: ["Settings-core"],
     uses_libs: ["org.apache.http.legacy"],
-    optional_uses_libs: [
-        "androidx.window.extensions",
-        "androidx.window.sidecar",
-    ],
     resource_dirs: [],
     optimize: {
         proguard_flags_files: ["proguard.flags"],
@@ -120,11 +116,6 @@ android_library_import {
     aars: ["libs/contextualcards.aar"],
 }
 
-android_library_import {
-    name: "windowExtLib",
-    aars: ["libs/window_ext_lib.aar"],
-}
-
 filegroup {
     name: "Settings_proguard_flags",
     srcs: ["proguard.flags"],
diff --git a/libs/window_ext_lib.aar b/libs/window_ext_lib.aar
deleted file mode 100644
index d34afbda298..00000000000
Binary files a/libs/window_ext_lib.aar and /dev/null differ
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index ee0a7d85518..5891ca35348 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -34,6 +34,7 @@ android_app {
         "androidx.cardview_cardview",
         "androidx.preference_preference",
         "androidx.recyclerview_recyclerview",
+        "androidx.window_window",
         "com.google.android.material_material",
         "setupcompat",
         "setupdesign",
@@ -50,7 +51,6 @@ android_app {
         "contextualcards",
         "settings-logtags",
         "zxing-core-1.7",
-        "windowExtLib",
     ],
 
     aaptflags: ["--extra-packages com.android.settings"],