Merge "Don't use androidx nodeps modules" into main am: 55afce91 am: e26393c5

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



Change-Id: Id2fadc6e3eeedfdaf34ceb826a079bdc8c2c12cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

packages/SystemUI/Android.bp

@@ -289,7 +289,7 @@ android_library {
         "WindowManager-Shell",
         "LowLightDreamLib",
         "motion_tool_lib",
-        "androidx.core_core-animation-testing-nodeps",
+        "androidx.core_core-animation-testing",
         "androidx.compose.ui_ui",
         "flag-junit",
         "ravenwood-junit",

packages/SystemUI/animation/Android.bp

@@ -41,7 +41,7 @@ android_library {
     ],
 
     static_libs: [
-        "androidx.core_core-animation-nodeps",
+        "androidx.core_core-animation",
         "androidx.core_core-ktx",
         "androidx.annotation_annotation",
         "com_android_systemui_flags_lib",
@@ -64,7 +64,7 @@ android_library {
     ],
 
     static_libs: [
-        "androidx.core_core-animation-nodeps",
+        "androidx.core_core-animation",
         "androidx.core_core-ktx",
         "androidx.annotation_annotation",
     ],