Merge "Create dedicated aconfig folder for catalyst" into main

aconfig/Android.bp

@@ -9,6 +9,7 @@ aconfig_declarations {
     container: "system",
     srcs: [
         "*.aconfig",
+        "catalyst/*.aconfig",
     ],
 }
 
@@ -77,4 +78,4 @@ aconfig_declarations {
 java_aconfig_library {
     name: "keyboard_flags_lib",
     aconfig_declarations: "keyboard_flags",
-}
+}

aconfig/catalyst/about_phone.aconfig

@@ -0,0 +1,9 @@
+package: "com.android.settings.flags"
+container: "system"
+
+flag {
+  name: "catalyst_legal_information"
+  namespace: "android_settings"
+  description: "Flag for Legal information"
+  bug: "323791114"
+}

aconfig/settings_flag_declarations.aconfig

@@ -50,13 +50,6 @@ flag {
     bug: "351884562"
 }
 
-flag {
-  name: "catalyst_legal_information"
-  namespace: "android_settings"
-  description: "This flag controls the About phone > Legal information page migration"
-  bug: "323791114"
-}
-
 flag {
     name: "updated_suggestion_card_aosp"
     namespace: "android_settings"