Merge "Update communal aconfig package to systemui" into main

packages/SystemUI/Android.bp

@@ -165,7 +165,6 @@ android_library {
         "SystemUISharedLib",
         "SystemUI-statsd",
         "SettingsLib",
-        "com_android_systemui_communal_flags_lib",
         "com_android_systemui_flags_lib",
         "androidx.core_core-ktx",
         "androidx.viewpager2_viewpager2",

packages/SystemUI/aconfig/Android.bp

@@ -2,8 +2,7 @@ aconfig_declarations {
     name: "com_android_systemui_flags",
     package: "com.android.systemui",
     srcs: [
-        "systemui.aconfig",
-        "accessibility.aconfig",
+        "*.aconfig",
     ],
 }
 
@@ -11,16 +10,3 @@ java_aconfig_library {
     name: "com_android_systemui_flags_lib",
     aconfig_declarations: "com_android_systemui_flags",
 }
-
-aconfig_declarations {
-    name: "com_android_systemui_communal_flags",
-    package: "com.android.systemui.communal",
-    srcs: [
-        "communal.aconfig",
-    ],
-}
-
-java_aconfig_library {
-    name: "com_android_systemui_communal_flags_lib",
-    aconfig_declarations: "com_android_systemui_communal_flags",
-}

packages/SystemUI/aconfig/communal.aconfig

-package: "com.android.systemui.communal"
+package: "com.android.systemui"
 
 flag {
     name: "communal_hub"