Delete trunk_staging as this config is not supported for AOSP releases.

Bug: b/415779582
Test: https://android-build.corp.google.com/abtd/run/L27500030011766217
Change-Id: Iab49e07da10bab5365ef0f7d643383b64741cf9c

3806 files changed, 0 insertions, 26255 deletions

diff --git a/aconfig/trunk_staging/Android.bp b/aconfig/trunk_staging/Android.bp
deleted file mode 100644
index 3add7b66..00000000
--- a/aconfig/trunk_staging/Android.bp
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_value_set {
-    name: "aconfig_value_set-platform_build_release-trunk_staging",
-    srcs: [
-        "*/Android.bp",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.adaptiveauth/Android.bp b/aconfig/trunk_staging/android.adaptiveauth/Android.bp
deleted file mode 100644
index 6abbb1f7..00000000
--- a/aconfig/trunk_staging/android.adaptiveauth/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-android.adaptiveauth-all",
-  package: "android.adaptiveauth",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/android.adaptiveauth/enable_adaptive_auth_flag_values.textproto b/aconfig/trunk_staging/android.adaptiveauth/enable_adaptive_auth_flag_values.textproto
deleted file mode 100644
index b443ae88..00000000
--- a/aconfig/trunk_staging/android.adaptiveauth/enable_adaptive_auth_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.adaptiveauth"
-  name: "enable_adaptive_auth"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.adaptiveauth/report_biometric_auth_attempts_flag_values.textproto b/aconfig/trunk_staging/android.adaptiveauth/report_biometric_auth_attempts_flag_values.textproto
deleted file mode 100644
index 56f34e69..00000000
--- a/aconfig/trunk_staging/android.adaptiveauth/report_biometric_auth_attempts_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.adaptiveauth"
-  name: "report_biometric_auth_attempts"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.adpf/Android.bp b/aconfig/trunk_staging/android.adpf/Android.bp
deleted file mode 100644
index 0775698f..00000000
--- a/aconfig/trunk_staging/android.adpf/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.adpf-all",
-    package: "android.adpf",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.adpf/adpf_viewrootimpl_action_down_boost_flag_values.textproto b/aconfig/trunk_staging/android.adpf/adpf_viewrootimpl_action_down_boost_flag_values.textproto
deleted file mode 100644
index 5d9271a5..00000000
--- a/aconfig/trunk_staging/android.adpf/adpf_viewrootimpl_action_down_boost_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.adpf"
-  name: "adpf_viewrootimpl_action_down_boost"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/Android.bp b/aconfig/trunk_staging/android.app.admin.flags/Android.bp
deleted file mode 100644
index 8fca0863..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.app.admin.flags-all",
-    package: "android.app.admin.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/active_admin_cleanup_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/active_admin_cleanup_flag_values.textproto
deleted file mode 100644
index a9e79522..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/active_admin_cleanup_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "active_admin_cleanup"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/allow_querying_profile_type_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/allow_querying_profile_type_flag_values.textproto
deleted file mode 100644
index f80ea20b..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/allow_querying_profile_type_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "allow_querying_profile_type"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/allow_screen_brightness_control_on_cope_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/allow_screen_brightness_control_on_cope_flag_values.textproto
deleted file mode 100644
index baa7848b..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/allow_screen_brightness_control_on_cope_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "allow_screen_brightness_control_on_cope"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/always_persist_do_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/always_persist_do_flag_values.textproto
deleted file mode 100644
index 198ad9d3..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/always_persist_do_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "always_persist_do"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/assist_content_user_restriction_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/assist_content_user_restriction_enabled_flag_values.textproto
deleted file mode 100644
index f825e5f7..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/assist_content_user_restriction_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "assist_content_user_restriction_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/backup_connected_apps_settings_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/backup_connected_apps_settings_flag_values.textproto
deleted file mode 100644
index 51b03185..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/backup_connected_apps_settings_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "backup_connected_apps_settings"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/backup_service_security_log_event_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/backup_service_security_log_event_enabled_flag_values.textproto
deleted file mode 100644
index ebdfb0da..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/backup_service_security_log_event_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "backup_service_security_log_event_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/coexistence_migration_for_non_emm_management_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/coexistence_migration_for_non_emm_management_enabled_flag_values.textproto
deleted file mode 100644
index 599537ce..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/coexistence_migration_for_non_emm_management_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "coexistence_migration_for_non_emm_management_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/copy_account_with_retry_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/copy_account_with_retry_enabled_flag_values.textproto
deleted file mode 100644
index 671b5b3b..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/copy_account_with_retry_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "copy_account_with_retry_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/cross_user_suspension_enabled_ro_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/cross_user_suspension_enabled_ro_flag_values.textproto
deleted file mode 100644
index 71fa9c4a..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/cross_user_suspension_enabled_ro_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "cross_user_suspension_enabled_ro"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/dedicated_device_control_api_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/dedicated_device_control_api_enabled_flag_values.textproto
deleted file mode 100644
index b2ab9ab4..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/dedicated_device_control_api_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "dedicated_device_control_api_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/dedicated_device_control_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/dedicated_device_control_enabled_flag_values.textproto
deleted file mode 100644
index 9ac9ca3c..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/dedicated_device_control_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "dedicated_device_control_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/default_sms_personal_app_suspension_fix_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/default_sms_personal_app_suspension_fix_enabled_flag_values.textproto
deleted file mode 100644
index 7ff58a3b..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/default_sms_personal_app_suspension_fix_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "default_sms_personal_app_suspension_fix_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/delete_private_space_under_restriction_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/delete_private_space_under_restriction_flag_values.textproto
deleted file mode 100644
index ab1aade3..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/delete_private_space_under_restriction_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "delete_private_space_under_restriction"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/device_policy_size_tracking_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/device_policy_size_tracking_enabled_flag_values.textproto
deleted file mode 100644
index 554adbad..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/device_policy_size_tracking_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "device_policy_size_tracking_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/device_policy_size_tracking_internal_bug_fix_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/device_policy_size_tracking_internal_bug_fix_enabled_flag_values.textproto
deleted file mode 100644
index 1de347cb..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/device_policy_size_tracking_internal_bug_fix_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "device_policy_size_tracking_internal_bug_fix_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/device_theft_api_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/device_theft_api_enabled_flag_values.textproto
deleted file mode 100644
index 7bf5267d..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/device_theft_api_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "device_theft_api_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/device_theft_impl_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/device_theft_impl_enabled_flag_values.textproto
deleted file mode 100644
index 7f3b7f79..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/device_theft_impl_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "device_theft_impl_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/disallow_user_control_bg_usage_fix_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/disallow_user_control_bg_usage_fix_flag_values.textproto
deleted file mode 100644
index cd7174a9..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/disallow_user_control_bg_usage_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "disallow_user_control_bg_usage_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/disallow_user_control_stopped_state_fix_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/disallow_user_control_stopped_state_fix_flag_values.textproto
deleted file mode 100644
index 506e6897..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/disallow_user_control_stopped_state_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "disallow_user_control_stopped_state_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/dmrh_set_app_restrictions_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/dmrh_set_app_restrictions_flag_values.textproto
deleted file mode 100644
index 02164905..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/dmrh_set_app_restrictions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "dmrh_set_app_restrictions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/dont_read_policy_definition_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/dont_read_policy_definition_flag_values.textproto
deleted file mode 100644
index 8f7592ee..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/dont_read_policy_definition_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "dont_read_policy_definition"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/dont_write_policy_definition_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/dont_write_policy_definition_flag_values.textproto
deleted file mode 100644
index 9e932599..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/dont_write_policy_definition_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "dont_write_policy_definition"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/dumpsys_policy_engine_migration_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/dumpsys_policy_engine_migration_enabled_flag_values.textproto
deleted file mode 100644
index abb3da1c..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/dumpsys_policy_engine_migration_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "dumpsys_policy_engine_migration_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/esim_management_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/esim_management_enabled_flag_values.textproto
deleted file mode 100644
index 8730b496..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/esim_management_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "esim_management_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/fix_race_condition_in_tie_profile_lock_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/fix_race_condition_in_tie_profile_lock_flag_values.textproto
deleted file mode 100644
index e8dd71fc..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/fix_race_condition_in_tie_profile_lock_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "fix_race_condition_in_tie_profile_lock"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/headless_device_owner_delegate_security_logging_bug_fix_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/headless_device_owner_delegate_security_logging_bug_fix_flag_values.textproto
deleted file mode 100644
index f75e493c..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/headless_device_owner_delegate_security_logging_bug_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "headless_device_owner_delegate_security_logging_bug_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/headless_device_owner_provisioning_fix_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/headless_device_owner_provisioning_fix_enabled_flag_values.textproto
deleted file mode 100644
index 60b012f8..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/headless_device_owner_provisioning_fix_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "headless_device_owner_provisioning_fix_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/headless_device_owner_single_user_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/headless_device_owner_single_user_enabled_flag_values.textproto
deleted file mode 100644
index 7f6c94ba..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/headless_device_owner_single_user_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "headless_device_owner_single_user_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/headless_single_user_bad_device_admin_state_fix_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/headless_single_user_bad_device_admin_state_fix_flag_values.textproto
deleted file mode 100644
index b8ebbd86..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/headless_single_user_bad_device_admin_state_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "headless_single_user_bad_device_admin_state_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/headless_single_user_compatibility_fix_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/headless_single_user_compatibility_fix_flag_values.textproto
deleted file mode 100644
index 970769ad..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/headless_single_user_compatibility_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "headless_single_user_compatibility_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/headless_single_user_fixes_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/headless_single_user_fixes_flag_values.textproto
deleted file mode 100644
index 6f5fb05e..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/headless_single_user_fixes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "headless_single_user_fixes"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/hsum_unlock_notification_fix_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/hsum_unlock_notification_fix_flag_values.textproto
deleted file mode 100644
index ae16913d..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/hsum_unlock_notification_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "hsum_unlock_notification_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/internal_log_event_listener_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/internal_log_event_listener_flag_values.textproto
deleted file mode 100644
index a832c0f8..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/internal_log_event_listener_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "internal_log_event_listener"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/is_mte_policy_enforced_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/is_mte_policy_enforced_flag_values.textproto
deleted file mode 100644
index 981c28eb..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/is_mte_policy_enforced_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "is_mte_policy_enforced"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/is_recursive_required_app_merging_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/is_recursive_required_app_merging_enabled_flag_values.textproto
deleted file mode 100644
index fb961f7c..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/is_recursive_required_app_merging_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "is_recursive_required_app_merging_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/management_mode_policy_metrics_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/management_mode_policy_metrics_flag_values.textproto
deleted file mode 100644
index adbb0a40..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/management_mode_policy_metrics_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "management_mode_policy_metrics"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/onboarding_bugreport_storage_bug_fix_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/onboarding_bugreport_storage_bug_fix_flag_values.textproto
deleted file mode 100644
index 1cb8e681..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/onboarding_bugreport_storage_bug_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "onboarding_bugreport_storage_bug_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/onboarding_bugreport_v2_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/onboarding_bugreport_v2_enabled_flag_values.textproto
deleted file mode 100644
index 10907691..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/onboarding_bugreport_v2_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "onboarding_bugreport_v2_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/onboarding_consentless_bugreports_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/onboarding_consentless_bugreports_flag_values.textproto
deleted file mode 100644
index a517dc09..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/onboarding_consentless_bugreports_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "onboarding_consentless_bugreports"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/permission_migration_for_zero_trust_api_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/permission_migration_for_zero_trust_api_enabled_flag_values.textproto
deleted file mode 100644
index 1bc1746f..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/permission_migration_for_zero_trust_api_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "permission_migration_for_zero_trust_api_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/permission_migration_for_zero_trust_impl_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/permission_migration_for_zero_trust_impl_enabled_flag_values.textproto
deleted file mode 100644
index 50e5222c..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/permission_migration_for_zero_trust_impl_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "permission_migration_for_zero_trust_impl_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/policy_engine_migration_v2_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/policy_engine_migration_v2_enabled_flag_values.textproto
deleted file mode 100644
index 5e707bc8..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/policy_engine_migration_v2_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "policy_engine_migration_v2_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/power_exemption_bg_usage_fix_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/power_exemption_bg_usage_fix_flag_values.textproto
deleted file mode 100644
index fda919d4..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/power_exemption_bg_usage_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "power_exemption_bg_usage_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/provisioning_context_parameter_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/provisioning_context_parameter_flag_values.textproto
deleted file mode 100644
index aa807354..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/provisioning_context_parameter_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "provisioning_context_parameter"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/quiet_mode_credential_bug_fix_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/quiet_mode_credential_bug_fix_flag_values.textproto
deleted file mode 100644
index 0c9d5d65..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/quiet_mode_credential_bug_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "quiet_mode_credential_bug_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/remove_managed_esim_on_work_profile_deletion_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/remove_managed_esim_on_work_profile_deletion_flag_values.textproto
deleted file mode 100644
index dc5c9f28..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/remove_managed_esim_on_work_profile_deletion_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "remove_managed_esim_on_work_profile_deletion"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/remove_managed_profile_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/remove_managed_profile_enabled_flag_values.textproto
deleted file mode 100644
index 54600251..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/remove_managed_profile_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "remove_managed_profile_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/secondary_lockscreen_api_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/secondary_lockscreen_api_enabled_flag_values.textproto
deleted file mode 100644
index ba8e9cfe..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/secondary_lockscreen_api_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "secondary_lockscreen_api_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/security_log_v2_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/security_log_v2_enabled_flag_values.textproto
deleted file mode 100644
index 5b149a6c..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/security_log_v2_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "security_log_v2_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/set_auto_time_enabled_coexistence_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/set_auto_time_enabled_coexistence_flag_values.textproto
deleted file mode 100644
index 52df7a48..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/set_auto_time_enabled_coexistence_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "set_auto_time_enabled_coexistence"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/set_auto_time_zone_enabled_coexistence_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/set_auto_time_zone_enabled_coexistence_flag_values.textproto
deleted file mode 100644
index b5b91499..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/set_auto_time_zone_enabled_coexistence_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "set_auto_time_zone_enabled_coexistence"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/set_mte_policy_coexistence_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/set_mte_policy_coexistence_flag_values.textproto
deleted file mode 100644
index 2bf794fc..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/set_mte_policy_coexistence_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "set_mte_policy_coexistence"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/split_create_managed_profile_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/split_create_managed_profile_enabled_flag_values.textproto
deleted file mode 100644
index 55f8545a..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/split_create_managed_profile_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "split_create_managed_profile_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/suspend_packages_coexistence_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/suspend_packages_coexistence_flag_values.textproto
deleted file mode 100644
index 541e2b07..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/suspend_packages_coexistence_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "suspend_packages_coexistence"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/unsuspend_not_suspended_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/unsuspend_not_suspended_flag_values.textproto
deleted file mode 100644
index ed7a7a9c..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/unsuspend_not_suspended_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "unsuspend_not_suspended"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/user_provisioning_same_state_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/user_provisioning_same_state_flag_values.textproto
deleted file mode 100644
index 8d3320d4..00000000
--- a/aconfig/trunk_staging/android.app.admin.flags/user_provisioning_same_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "user_provisioning_same_state"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.appfunctions.flags/Android.bp b/aconfig/trunk_staging/android.app.appfunctions.flags/Android.bp
deleted file mode 100644
index 72944514..00000000
--- a/aconfig/trunk_staging/android.app.appfunctions.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-android.app.appfunctions.flags-all",
-  package: "android.app.appfunctions.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/android.app.appfunctions.flags/enable_app_function_manager_flag_values.textproto b/aconfig/trunk_staging/android.app.appfunctions.flags/enable_app_function_manager_flag_values.textproto
deleted file mode 100644
index 917e76b5..00000000
--- a/aconfig/trunk_staging/android.app.appfunctions.flags/enable_app_function_manager_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.appfunctions.flags"
-  name: "enable_app_function_manager"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.app.assist.flags/Android.bp b/aconfig/trunk_staging/android.app.assist.flags/Android.bp
deleted file mode 100644
index 34966b8d..00000000
--- a/aconfig/trunk_staging/android.app.assist.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.app.assist.flags-all",
-    package: "android.app.assist.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.app.assist.flags/add_placeholder_view_for_null_child_flag_values.textproto b/aconfig/trunk_staging/android.app.assist.flags/add_placeholder_view_for_null_child_flag_values.textproto
deleted file mode 100644
index 152abe9d..00000000
--- a/aconfig/trunk_staging/android.app.assist.flags/add_placeholder_view_for_null_child_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.assist.flags"
-  name: "add_placeholder_view_for_null_child"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.app.contextualsearch.flags/Android.bp b/aconfig/trunk_staging/android.app.contextualsearch.flags/Android.bp
deleted file mode 100644
index ba13bc9e..00000000
--- a/aconfig/trunk_staging/android.app.contextualsearch.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.app.contextualsearch.flags-all",
-    package: "android.app.contextualsearch.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.app.contextualsearch.flags/contextual_search_prevent_self_capture_flag_values.textproto b/aconfig/trunk_staging/android.app.contextualsearch.flags/contextual_search_prevent_self_capture_flag_values.textproto
deleted file mode 100644
index 69073cdb..00000000
--- a/aconfig/trunk_staging/android.app.contextualsearch.flags/contextual_search_prevent_self_capture_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.contextualsearch.flags"
-  name: "contextual_search_prevent_self_capture"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.contextualsearch.flags/contextual_search_window_layer_flag_values.textproto b/aconfig/trunk_staging/android.app.contextualsearch.flags/contextual_search_window_layer_flag_values.textproto
deleted file mode 100644
index 9c8a8573..00000000
--- a/aconfig/trunk_staging/android.app.contextualsearch.flags/contextual_search_window_layer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.contextualsearch.flags"
-  name: "contextual_search_window_layer"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.contextualsearch.flags/enable_service_flag_values.textproto b/aconfig/trunk_staging/android.app.contextualsearch.flags/enable_service_flag_values.textproto
deleted file mode 100644
index e8d02314..00000000
--- a/aconfig/trunk_staging/android.app.contextualsearch.flags/enable_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.contextualsearch.flags"
-  name: "enable_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.contextualsearch.flags/multi_window_screen_context_flag_values.textproto b/aconfig/trunk_staging/android.app.contextualsearch.flags/multi_window_screen_context_flag_values.textproto
deleted file mode 100644
index 1106a476..00000000
--- a/aconfig/trunk_staging/android.app.contextualsearch.flags/multi_window_screen_context_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.contextualsearch.flags"
-  name: "multi_window_screen_context"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.contextualsearch.flags/report_secure_surfaces_in_assist_structure_flag_values.textproto b/aconfig/trunk_staging/android.app.contextualsearch.flags/report_secure_surfaces_in_assist_structure_flag_values.textproto
deleted file mode 100644
index d104631a..00000000
--- a/aconfig/trunk_staging/android.app.contextualsearch.flags/report_secure_surfaces_in_assist_structure_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.contextualsearch.flags"
-  name: "report_secure_surfaces_in_assist_structure"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.jank/Android.bp b/aconfig/trunk_staging/android.app.jank/Android.bp
deleted file mode 100644
index ffd18051..00000000
--- a/aconfig/trunk_staging/android.app.jank/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.app.jank-all",
-    package: "android.app.jank",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.app.jank/detailed_app_jank_metrics_api_flag_values.textproto b/aconfig/trunk_staging/android.app.jank/detailed_app_jank_metrics_api_flag_values.textproto
deleted file mode 100644
index 23e96f59..00000000
--- a/aconfig/trunk_staging/android.app.jank/detailed_app_jank_metrics_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.jank"
-  name: "detailed_app_jank_metrics_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.jank/detailed_app_jank_metrics_logging_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.jank/detailed_app_jank_metrics_logging_enabled_flag_values.textproto
deleted file mode 100644
index 84aef50f..00000000
--- a/aconfig/trunk_staging/android.app.jank/detailed_app_jank_metrics_logging_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.jank"
-  name: "detailed_app_jank_metrics_logging_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.jank/viewroot_choreographer_flag_values.textproto b/aconfig/trunk_staging/android.app.jank/viewroot_choreographer_flag_values.textproto
deleted file mode 100644
index 44add928..00000000
--- a/aconfig/trunk_staging/android.app.jank/viewroot_choreographer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.jank"
-  name: "viewroot_choreographer"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.job/Android.bp b/aconfig/trunk_staging/android.app.job/Android.bp
deleted file mode 100644
index 99bcadb8..00000000
--- a/aconfig/trunk_staging/android.app.job/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.app.job-all",
-    package: "android.app.job",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.app.job/add_type_info_to_wakelock_tag_flag_values.textproto b/aconfig/trunk_staging/android.app.job/add_type_info_to_wakelock_tag_flag_values.textproto
deleted file mode 100644
index 0f2ba88d..00000000
--- a/aconfig/trunk_staging/android.app.job/add_type_info_to_wakelock_tag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.job"
-  name: "add_type_info_to_wakelock_tag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.job/get_pending_job_reasons_api_flag_values.textproto b/aconfig/trunk_staging/android.app.job/get_pending_job_reasons_api_flag_values.textproto
deleted file mode 100644
index 9492b1fd..00000000
--- a/aconfig/trunk_staging/android.app.job/get_pending_job_reasons_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.job"
-  name: "get_pending_job_reasons_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.job/get_pending_job_reasons_history_api_flag_values.textproto b/aconfig/trunk_staging/android.app.job/get_pending_job_reasons_history_api_flag_values.textproto
deleted file mode 100644
index 11e7fe0b..00000000
--- a/aconfig/trunk_staging/android.app.job/get_pending_job_reasons_history_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.job"
-  name: "get_pending_job_reasons_history_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.job/handle_abandoned_jobs_flag_values.textproto b/aconfig/trunk_staging/android.app.job/handle_abandoned_jobs_flag_values.textproto
deleted file mode 100644
index 6f04a07a..00000000
--- a/aconfig/trunk_staging/android.app.job/handle_abandoned_jobs_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.job"
-  name: "handle_abandoned_jobs"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.job/ignore_important_while_foreground_flag_values.textproto b/aconfig/trunk_staging/android.app.job/ignore_important_while_foreground_flag_values.textproto
deleted file mode 100644
index b448b7fc..00000000
--- a/aconfig/trunk_staging/android.app.job/ignore_important_while_foreground_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.job"
-  name: "ignore_important_while_foreground"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.job/job_debug_info_apis_flag_values.textproto b/aconfig/trunk_staging/android.app.job/job_debug_info_apis_flag_values.textproto
deleted file mode 100644
index e45039f9..00000000
--- a/aconfig/trunk_staging/android.app.job/job_debug_info_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.job"
-  name: "job_debug_info_apis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.ondeviceintelligence.flags/Android.bp b/aconfig/trunk_staging/android.app.ondeviceintelligence.flags/Android.bp
deleted file mode 100644
index 4c8c935f..00000000
--- a/aconfig/trunk_staging/android.app.ondeviceintelligence.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.app.ondeviceintelligence.flags-all",
-    package: "android.app.ondeviceintelligence.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.app.ondeviceintelligence.flags/enable_on_device_intelligence_flag_values.textproto b/aconfig/trunk_staging/android.app.ondeviceintelligence.flags/enable_on_device_intelligence_flag_values.textproto
deleted file mode 100644
index 2383bf45..00000000
--- a/aconfig/trunk_staging/android.app.ondeviceintelligence.flags/enable_on_device_intelligence_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.ondeviceintelligence.flags"
-  name: "enable_on_device_intelligence"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.ondeviceintelligence.flags/enable_on_device_intelligence_module_flag_values.textproto b/aconfig/trunk_staging/android.app.ondeviceintelligence.flags/enable_on_device_intelligence_module_flag_values.textproto
deleted file mode 100644
index eb5ef4d6..00000000
--- a/aconfig/trunk_staging/android.app.ondeviceintelligence.flags/enable_on_device_intelligence_module_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.ondeviceintelligence.flags"
-  name: "enable_on_device_intelligence_module"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.smartspace.flags/Android.bp b/aconfig/trunk_staging/android.app.smartspace.flags/Android.bp
deleted file mode 100644
index b24f6940..00000000
--- a/aconfig/trunk_staging/android.app.smartspace.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-android.app.smartspace.flags-all",
-  package: "android.app.smartspace.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/android.app.smartspace.flags/access_smartspace_flag_values.textproto b/aconfig/trunk_staging/android.app.smartspace.flags/access_smartspace_flag_values.textproto
deleted file mode 100644
index 8e79caf8..00000000
--- a/aconfig/trunk_staging/android.app.smartspace.flags/access_smartspace_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.smartspace.flags"
-  name: "access_smartspace"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.smartspace.flags/remote_views_flag_values.textproto b/aconfig/trunk_staging/android.app.smartspace.flags/remote_views_flag_values.textproto
deleted file mode 100644
index 0546b76c..00000000
--- a/aconfig/trunk_staging/android.app.smartspace.flags/remote_views_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.smartspace.flags"
-  name: "remote_views"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.supervision.flags/Android.bp b/aconfig/trunk_staging/android.app.supervision.flags/Android.bp
deleted file mode 100644
index fbddb093..00000000
--- a/aconfig/trunk_staging/android.app.supervision.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.app.supervision.flags-all",
-    package: "android.app.supervision.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.app.supervision.flags/deprecate_dpm_supervision_apis_flag_values.textproto b/aconfig/trunk_staging/android.app.supervision.flags/deprecate_dpm_supervision_apis_flag_values.textproto
deleted file mode 100644
index 76e84850..00000000
--- a/aconfig/trunk_staging/android.app.supervision.flags/deprecate_dpm_supervision_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.supervision.flags"
-  name: "deprecate_dpm_supervision_apis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.supervision.flags/enable_app_approval_flag_values.textproto b/aconfig/trunk_staging/android.app.supervision.flags/enable_app_approval_flag_values.textproto
deleted file mode 100644
index eb500ac7..00000000
--- a/aconfig/trunk_staging/android.app.supervision.flags/enable_app_approval_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.supervision.flags"
-  name: "enable_app_approval"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.supervision.flags/enable_supervision_app_service_flag_values.textproto b/aconfig/trunk_staging/android.app.supervision.flags/enable_supervision_app_service_flag_values.textproto
deleted file mode 100644
index 68b3ec93..00000000
--- a/aconfig/trunk_staging/android.app.supervision.flags/enable_supervision_app_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.supervision.flags"
-  name: "enable_supervision_app_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.supervision.flags/enable_supervision_settings_screen_flag_values.textproto b/aconfig/trunk_staging/android.app.supervision.flags/enable_supervision_settings_screen_flag_values.textproto
deleted file mode 100644
index c3afa1b6..00000000
--- a/aconfig/trunk_staging/android.app.supervision.flags/enable_supervision_settings_screen_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.supervision.flags"
-  name: "enable_supervision_settings_screen"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.supervision.flags/enable_sync_with_dpm_flag_values.textproto b/aconfig/trunk_staging/android.app.supervision.flags/enable_sync_with_dpm_flag_values.textproto
deleted file mode 100644
index cfee9a67..00000000
--- a/aconfig/trunk_staging/android.app.supervision.flags/enable_sync_with_dpm_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.supervision.flags"
-  name: "enable_sync_with_dpm"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.supervision.flags/enable_web_content_filters_screen_flag_values.textproto b/aconfig/trunk_staging/android.app.supervision.flags/enable_web_content_filters_screen_flag_values.textproto
deleted file mode 100644
index 94eff6e1..00000000
--- a/aconfig/trunk_staging/android.app.supervision.flags/enable_web_content_filters_screen_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.supervision.flags"
-  name: "enable_web_content_filters_screen"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.supervision.flags/supervision_api_flag_values.textproto b/aconfig/trunk_staging/android.app.supervision.flags/supervision_api_flag_values.textproto
deleted file mode 100644
index 71566926..00000000
--- a/aconfig/trunk_staging/android.app.supervision.flags/supervision_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.supervision.flags"
-  name: "supervision_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.supervision.flags/supervision_api_on_wear_flag_values.textproto b/aconfig/trunk_staging/android.app.supervision.flags/supervision_api_on_wear_flag_values.textproto
deleted file mode 100644
index 69b59e3f..00000000
--- a/aconfig/trunk_staging/android.app.supervision.flags/supervision_api_on_wear_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.supervision.flags"
-  name: "supervision_api_on_wear"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.supervision.flags/supervision_manager_apis_flag_values.textproto b/aconfig/trunk_staging/android.app.supervision.flags/supervision_manager_apis_flag_values.textproto
deleted file mode 100644
index f177cb2e..00000000
--- a/aconfig/trunk_staging/android.app.supervision.flags/supervision_manager_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.supervision.flags"
-  name: "supervision_manager_apis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.usage/Android.bp b/aconfig/trunk_staging/android.app.usage/Android.bp
deleted file mode 100644
index 95cf1541..00000000
--- a/aconfig/trunk_staging/android.app.usage/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.app.usage-all",
-    package: "android.app.usage",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.app.usage/disable_idle_check_flag_values.textproto b/aconfig/trunk_staging/android.app.usage/disable_idle_check_flag_values.textproto
deleted file mode 100644
index c7e92a58..00000000
--- a/aconfig/trunk_staging/android.app.usage/disable_idle_check_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.usage"
-  name: "disable_idle_check"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.app.usage/filter_based_event_query_api_flag_values.textproto b/aconfig/trunk_staging/android.app.usage/filter_based_event_query_api_flag_values.textproto
deleted file mode 100644
index faf5661d..00000000
--- a/aconfig/trunk_staging/android.app.usage/filter_based_event_query_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.usage"
-  name: "filter_based_event_query_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.usage/get_app_art_managed_bytes_flag_values.textproto b/aconfig/trunk_staging/android.app.usage/get_app_art_managed_bytes_flag_values.textproto
deleted file mode 100644
index dedc5c67..00000000
--- a/aconfig/trunk_staging/android.app.usage/get_app_art_managed_bytes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.usage"
-  name: "get_app_art_managed_bytes"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.usage/get_app_bytes_by_data_type_api_flag_values.textproto b/aconfig/trunk_staging/android.app.usage/get_app_bytes_by_data_type_api_flag_values.textproto
deleted file mode 100644
index 79d6d4ea..00000000
--- a/aconfig/trunk_staging/android.app.usage/get_app_bytes_by_data_type_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.usage"
-  name: "get_app_bytes_by_data_type_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.usage/report_usage_stats_permission_flag_values.textproto b/aconfig/trunk_staging/android.app.usage/report_usage_stats_permission_flag_values.textproto
deleted file mode 100644
index 554bb145..00000000
--- a/aconfig/trunk_staging/android.app.usage/report_usage_stats_permission_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.usage"
-  name: "report_usage_stats_permission"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.usage/use_dedicated_handler_thread_flag_values.textproto b/aconfig/trunk_staging/android.app.usage/use_dedicated_handler_thread_flag_values.textproto
deleted file mode 100644
index 99a0b66f..00000000
--- a/aconfig/trunk_staging/android.app.usage/use_dedicated_handler_thread_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.usage"
-  name: "use_dedicated_handler_thread"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.app.usage/use_parceled_list_flag_values.textproto b/aconfig/trunk_staging/android.app.usage/use_parceled_list_flag_values.textproto
deleted file mode 100644
index ea542509..00000000
--- a/aconfig/trunk_staging/android.app.usage/use_parceled_list_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.usage"
-  name: "use_parceled_list"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.usage/user_interaction_type_api_flag_values.textproto b/aconfig/trunk_staging/android.app.usage/user_interaction_type_api_flag_values.textproto
deleted file mode 100644
index 63085e85..00000000
--- a/aconfig/trunk_staging/android.app.usage/user_interaction_type_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.usage"
-  name: "user_interaction_type_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.wearable/Android.bp b/aconfig/trunk_staging/android.app.wearable/Android.bp
deleted file mode 100644
index 0ae84cb5..00000000
--- a/aconfig/trunk_staging/android.app.wearable/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.app.wearable-all",
-    package: "android.app.wearable",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.app.wearable/enable_concurrent_wearable_connections_flag_values.textproto b/aconfig/trunk_staging/android.app.wearable/enable_concurrent_wearable_connections_flag_values.textproto
deleted file mode 100644
index e866d223..00000000
--- a/aconfig/trunk_staging/android.app.wearable/enable_concurrent_wearable_connections_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.wearable"
-  name: "enable_concurrent_wearable_connections"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.wearable/enable_data_request_observer_api_flag_values.textproto b/aconfig/trunk_staging/android.app.wearable/enable_data_request_observer_api_flag_values.textproto
deleted file mode 100644
index 9eba496a..00000000
--- a/aconfig/trunk_staging/android.app.wearable/enable_data_request_observer_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.wearable"
-  name: "enable_data_request_observer_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.wearable/enable_hotword_wearable_sensing_api_flag_values.textproto b/aconfig/trunk_staging/android.app.wearable/enable_hotword_wearable_sensing_api_flag_values.textproto
deleted file mode 100644
index 336323e2..00000000
--- a/aconfig/trunk_staging/android.app.wearable/enable_hotword_wearable_sensing_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.wearable"
-  name: "enable_hotword_wearable_sensing_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.wearable/enable_provide_read_only_pfd_flag_values.textproto b/aconfig/trunk_staging/android.app.wearable/enable_provide_read_only_pfd_flag_values.textproto
deleted file mode 100644
index 390ea0f1..00000000
--- a/aconfig/trunk_staging/android.app.wearable/enable_provide_read_only_pfd_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.wearable"
-  name: "enable_provide_read_only_pfd"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.wearable/enable_provide_wearable_connection_api_flag_values.textproto b/aconfig/trunk_staging/android.app.wearable/enable_provide_wearable_connection_api_flag_values.textproto
deleted file mode 100644
index cdf2034d..00000000
--- a/aconfig/trunk_staging/android.app.wearable/enable_provide_wearable_connection_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.wearable"
-  name: "enable_provide_wearable_connection_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.wearable/enable_restart_wss_process_flag_values.textproto b/aconfig/trunk_staging/android.app.wearable/enable_restart_wss_process_flag_values.textproto
deleted file mode 100644
index 651a4152..00000000
--- a/aconfig/trunk_staging/android.app.wearable/enable_restart_wss_process_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.wearable"
-  name: "enable_restart_wss_process"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.wearable/enable_unsupported_operation_status_code_flag_values.textproto b/aconfig/trunk_staging/android.app.wearable/enable_unsupported_operation_status_code_flag_values.textproto
deleted file mode 100644
index 80462ee7..00000000
--- a/aconfig/trunk_staging/android.app.wearable/enable_unsupported_operation_status_code_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.wearable"
-  name: "enable_unsupported_operation_status_code"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/Android.bp b/aconfig/trunk_staging/android.app/Android.bp
deleted file mode 100644
index 211e64fc..00000000
--- a/aconfig/trunk_staging/android.app/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.app-all",
-    package: "android.app",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.app/TEST_MAPPING b/aconfig/trunk_staging/android.app/TEST_MAPPING
deleted file mode 100644
index 2fa15f3a..00000000
--- a/aconfig/trunk_staging/android.app/TEST_MAPPING
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "imports": [
-    {
-      "path": "frameworks/base/core/java/android/app"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/aconfig/trunk_staging/android.app/accurate_wallpaper_downsampling_flag_values.textproto b/aconfig/trunk_staging/android.app/accurate_wallpaper_downsampling_flag_values.textproto
deleted file mode 100644
index 3f22d49f..00000000
--- a/aconfig/trunk_staging/android.app/accurate_wallpaper_downsampling_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "accurate_wallpaper_downsampling"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/api_rich_ongoing_flag_values.textproto b/aconfig/trunk_staging/android.app/api_rich_ongoing_flag_values.textproto
deleted file mode 100644
index c8ee312d..00000000
--- a/aconfig/trunk_staging/android.app/api_rich_ongoing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "api_rich_ongoing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/api_tvextender_flag_values.textproto b/aconfig/trunk_staging/android.app/api_tvextender_flag_values.textproto
deleted file mode 100644
index 415716d2..00000000
--- a/aconfig/trunk_staging/android.app/api_tvextender_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "api_tvextender"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.app/app_restrictions_api_flag_values.textproto b/aconfig/trunk_staging/android.app/app_restrictions_api_flag_values.textproto
deleted file mode 100644
index 5ed72495..00000000
--- a/aconfig/trunk_staging/android.app/app_restrictions_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "app_restrictions_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/app_start_info_cleanup_old_records_flag_values.textproto b/aconfig/trunk_staging/android.app/app_start_info_cleanup_old_records_flag_values.textproto
deleted file mode 100644
index 9c2d6572..00000000
--- a/aconfig/trunk_staging/android.app/app_start_info_cleanup_old_records_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "app_start_info_cleanup_old_records"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/app_start_info_component_flag_values.textproto b/aconfig/trunk_staging/android.app/app_start_info_component_flag_values.textproto
deleted file mode 100644
index c394c41d..00000000
--- a/aconfig/trunk_staging/android.app/app_start_info_component_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "app_start_info_component"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/app_start_info_flag_values.textproto b/aconfig/trunk_staging/android.app/app_start_info_flag_values.textproto
deleted file mode 100644
index 63d9882f..00000000
--- a/aconfig/trunk_staging/android.app/app_start_info_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "app_start_info"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/app_start_info_keep_records_sorted_flag_values.textproto b/aconfig/trunk_staging/android.app/app_start_info_keep_records_sorted_flag_values.textproto
deleted file mode 100644
index e268a4c3..00000000
--- a/aconfig/trunk_staging/android.app/app_start_info_keep_records_sorted_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "app_start_info_keep_records_sorted"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/app_start_info_timestamps_flag_values.textproto b/aconfig/trunk_staging/android.app/app_start_info_timestamps_flag_values.textproto
deleted file mode 100644
index d3cc870d..00000000
--- a/aconfig/trunk_staging/android.app/app_start_info_timestamps_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "app_start_info_timestamps"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/background_install_control_callback_api_flag_values.textproto b/aconfig/trunk_staging/android.app/background_install_control_callback_api_flag_values.textproto
deleted file mode 100644
index a53c0abb..00000000
--- a/aconfig/trunk_staging/android.app/background_install_control_callback_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "background_install_control_callback_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/bic_client_flag_values.textproto b/aconfig/trunk_staging/android.app/bic_client_flag_values.textproto
deleted file mode 100644
index c250c21b..00000000
--- a/aconfig/trunk_staging/android.app/bic_client_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "bic_client"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.app/cache_get_current_user_id_flag_values.textproto b/aconfig/trunk_staging/android.app/cache_get_current_user_id_flag_values.textproto
deleted file mode 100644
index 521b93dc..00000000
--- a/aconfig/trunk_staging/android.app/cache_get_current_user_id_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "cache_get_current_user_id"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.app/category_voicemail_flag_values.textproto b/aconfig/trunk_staging/android.app/category_voicemail_flag_values.textproto
deleted file mode 100644
index 3649cb19..00000000
--- a/aconfig/trunk_staging/android.app/category_voicemail_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "category_voicemail"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/check_autogroup_before_post_flag_values.textproto b/aconfig/trunk_staging/android.app/check_autogroup_before_post_flag_values.textproto
deleted file mode 100644
index 4ccf1a2d..00000000
--- a/aconfig/trunk_staging/android.app/check_autogroup_before_post_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "check_autogroup_before_post"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/clean_up_spans_and_new_lines_flag_values.textproto b/aconfig/trunk_staging/android.app/clean_up_spans_and_new_lines_flag_values.textproto
deleted file mode 100644
index b8e11350..00000000
--- a/aconfig/trunk_staging/android.app/clean_up_spans_and_new_lines_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "clean_up_spans_and_new_lines"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/clear_dns_cache_on_network_rules_update_flag_values.textproto b/aconfig/trunk_staging/android.app/clear_dns_cache_on_network_rules_update_flag_values.textproto
deleted file mode 100644
index bc084094..00000000
--- a/aconfig/trunk_staging/android.app/clear_dns_cache_on_network_rules_update_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "clear_dns_cache_on_network_rules_update"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/compact_heads_up_notification_flag_values.textproto b/aconfig/trunk_staging/android.app/compact_heads_up_notification_flag_values.textproto
deleted file mode 100644
index 4496a6c5..00000000
--- a/aconfig/trunk_staging/android.app/compact_heads_up_notification_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "compact_heads_up_notification"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/device_unlock_listener_flag_values.textproto b/aconfig/trunk_staging/android.app/device_unlock_listener_flag_values.textproto
deleted file mode 100644
index 99f0f926..00000000
--- a/aconfig/trunk_staging/android.app/device_unlock_listener_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "device_unlock_listener"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/enable_connected_displays_wallpaper_flag_values.textproto b/aconfig/trunk_staging/android.app/enable_connected_displays_wallpaper_flag_values.textproto
deleted file mode 100644
index b5e6050b..00000000
--- a/aconfig/trunk_staging/android.app/enable_connected_displays_wallpaper_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "enable_connected_displays_wallpaper"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/enable_current_mode_type_binder_cache_flag_values.textproto b/aconfig/trunk_staging/android.app/enable_current_mode_type_binder_cache_flag_values.textproto
deleted file mode 100644
index 352a75cf..00000000
--- a/aconfig/trunk_staging/android.app/enable_current_mode_type_binder_cache_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "enable_current_mode_type_binder_cache"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.app/enable_fgs_timeout_crash_behavior_flag_values.textproto b/aconfig/trunk_staging/android.app/enable_fgs_timeout_crash_behavior_flag_values.textproto
deleted file mode 100644
index f5f9727d..00000000
--- a/aconfig/trunk_staging/android.app/enable_fgs_timeout_crash_behavior_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "enable_fgs_timeout_crash_behavior"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/enable_night_mode_binder_cache_flag_values.textproto b/aconfig/trunk_staging/android.app/enable_night_mode_binder_cache_flag_values.textproto
deleted file mode 100644
index 2db6e77c..00000000
--- a/aconfig/trunk_staging/android.app/enable_night_mode_binder_cache_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "enable_night_mode_binder_cache"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/enable_pip_ui_state_callback_on_entering_flag_values.textproto b/aconfig/trunk_staging/android.app/enable_pip_ui_state_callback_on_entering_flag_values.textproto
deleted file mode 100644
index fb495eab..00000000
--- a/aconfig/trunk_staging/android.app/enable_pip_ui_state_callback_on_entering_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "enable_pip_ui_state_callback_on_entering"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/enable_process_observer_broadcast_on_process_started_flag_values.textproto b/aconfig/trunk_staging/android.app/enable_process_observer_broadcast_on_process_started_flag_values.textproto
deleted file mode 100644
index 57dad818..00000000
--- a/aconfig/trunk_staging/android.app/enable_process_observer_broadcast_on_process_started_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "enable_process_observer_broadcast_on_process_started"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/enable_tv_implicit_enter_pip_restriction_flag_values.textproto b/aconfig/trunk_staging/android.app/enable_tv_implicit_enter_pip_restriction_flag_values.textproto
deleted file mode 100644
index 2d67515f..00000000
--- a/aconfig/trunk_staging/android.app/enable_tv_implicit_enter_pip_restriction_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "enable_tv_implicit_enter_pip_restriction"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/enforce_pic_testmode_protocol_flag_values.textproto b/aconfig/trunk_staging/android.app/enforce_pic_testmode_protocol_flag_values.textproto
deleted file mode 100644
index bd14cbaf..00000000
--- a/aconfig/trunk_staging/android.app/enforce_pic_testmode_protocol_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "enforce_pic_testmode_protocol"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.app/evenly_divided_call_style_action_layout_flag_values.textproto b/aconfig/trunk_staging/android.app/evenly_divided_call_style_action_layout_flag_values.textproto
deleted file mode 100644
index 264441c8..00000000
--- a/aconfig/trunk_staging/android.app/evenly_divided_call_style_action_layout_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "evenly_divided_call_style_action_layout"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/expanding_public_view_flag_values.textproto b/aconfig/trunk_staging/android.app/expanding_public_view_flag_values.textproto
deleted file mode 100644
index 69a91e33..00000000
--- a/aconfig/trunk_staging/android.app/expanding_public_view_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "expanding_public_view"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/fix_wallpaper_changed_flag_values.textproto b/aconfig/trunk_staging/android.app/fix_wallpaper_changed_flag_values.textproto
deleted file mode 100644
index d38e6fe3..00000000
--- a/aconfig/trunk_staging/android.app/fix_wallpaper_changed_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "fix_wallpaper_changed"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/get_binding_uid_importance_flag_values.textproto b/aconfig/trunk_staging/android.app/get_binding_uid_importance_flag_values.textproto
deleted file mode 100644
index 550aa72a..00000000
--- a/aconfig/trunk_staging/android.app/get_binding_uid_importance_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "get_binding_uid_importance"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/introduce_new_service_ontimeout_callback_flag_values.textproto b/aconfig/trunk_staging/android.app/introduce_new_service_ontimeout_callback_flag_values.textproto
deleted file mode 100644
index 5cdf4452..00000000
--- a/aconfig/trunk_staging/android.app/introduce_new_service_ontimeout_callback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "introduce_new_service_ontimeout_callback"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/jank_perceptible_narrow_flag_values.textproto b/aconfig/trunk_staging/android.app/jank_perceptible_narrow_flag_values.textproto
deleted file mode 100644
index bb56da40..00000000
--- a/aconfig/trunk_staging/android.app/jank_perceptible_narrow_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "jank_perceptible_narrow"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/keyguard_private_notifications_flag_values.textproto b/aconfig/trunk_staging/android.app/keyguard_private_notifications_flag_values.textproto
deleted file mode 100644
index e8c1a215..00000000
--- a/aconfig/trunk_staging/android.app/keyguard_private_notifications_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "keyguard_private_notifications"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/lifetime_extension_refactor_flag_values.textproto b/aconfig/trunk_staging/android.app/lifetime_extension_refactor_flag_values.textproto
deleted file mode 100644
index ad672427..00000000
--- a/aconfig/trunk_staging/android.app/lifetime_extension_refactor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "lifetime_extension_refactor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/live_wallpaper_content_handling_flag_values.textproto b/aconfig/trunk_staging/android.app/live_wallpaper_content_handling_flag_values.textproto
deleted file mode 100644
index cf704e82..00000000
--- a/aconfig/trunk_staging/android.app/live_wallpaper_content_handling_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "live_wallpaper_content_handling"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/modes_api_flag_values.textproto b/aconfig/trunk_staging/android.app/modes_api_flag_values.textproto
deleted file mode 100644
index 215a6149..00000000
--- a/aconfig/trunk_staging/android.app/modes_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "modes_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/modes_cleanup_implicit_flag_values.textproto b/aconfig/trunk_staging/android.app/modes_cleanup_implicit_flag_values.textproto
deleted file mode 100644
index a3273ff4..00000000
--- a/aconfig/trunk_staging/android.app/modes_cleanup_implicit_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "modes_cleanup_implicit"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/modes_hsum_flag_values.textproto b/aconfig/trunk_staging/android.app/modes_hsum_flag_values.textproto
deleted file mode 100644
index 2a40e6ee..00000000
--- a/aconfig/trunk_staging/android.app/modes_hsum_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "modes_hsum"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/modes_multiuser_flag_values.textproto b/aconfig/trunk_staging/android.app/modes_multiuser_flag_values.textproto
deleted file mode 100644
index 44174eae..00000000
--- a/aconfig/trunk_staging/android.app/modes_multiuser_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "modes_multiuser"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/modes_ui_dnd_tile_flag_values.textproto b/aconfig/trunk_staging/android.app/modes_ui_dnd_tile_flag_values.textproto
deleted file mode 100644
index 4cfef329..00000000
--- a/aconfig/trunk_staging/android.app/modes_ui_dnd_tile_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "modes_ui_dnd_tile"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/modes_ui_empty_shade_flag_values.textproto b/aconfig/trunk_staging/android.app/modes_ui_empty_shade_flag_values.textproto
deleted file mode 100644
index 686c3d6b..00000000
--- a/aconfig/trunk_staging/android.app/modes_ui_empty_shade_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "modes_ui_empty_shade"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/modes_ui_flag_values.textproto b/aconfig/trunk_staging/android.app/modes_ui_flag_values.textproto
deleted file mode 100644
index eb40be73..00000000
--- a/aconfig/trunk_staging/android.app/modes_ui_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "modes_ui"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/modes_ui_icons_flag_values.textproto b/aconfig/trunk_staging/android.app/modes_ui_icons_flag_values.textproto
deleted file mode 100644
index 50cba9be..00000000
--- a/aconfig/trunk_staging/android.app/modes_ui_icons_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "modes_ui_icons"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/nm_binder_perf_cache_channels_flag_values.textproto b/aconfig/trunk_staging/android.app/nm_binder_perf_cache_channels_flag_values.textproto
deleted file mode 100644
index ea971962..00000000
--- a/aconfig/trunk_staging/android.app/nm_binder_perf_cache_channels_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "nm_binder_perf_cache_channels"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/nm_binder_perf_get_apps_with_channels_flag_values.textproto b/aconfig/trunk_staging/android.app/nm_binder_perf_get_apps_with_channels_flag_values.textproto
deleted file mode 100644
index 40d70e08..00000000
--- a/aconfig/trunk_staging/android.app/nm_binder_perf_get_apps_with_channels_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "nm_binder_perf_get_apps_with_channels"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/nm_binder_perf_log_nm_throttling_flag_values.textproto b/aconfig/trunk_staging/android.app/nm_binder_perf_log_nm_throttling_flag_values.textproto
deleted file mode 100644
index dc398618..00000000
--- a/aconfig/trunk_staging/android.app/nm_binder_perf_log_nm_throttling_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "nm_binder_perf_log_nm_throttling"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/nm_binder_perf_permission_check_flag_values.textproto b/aconfig/trunk_staging/android.app/nm_binder_perf_permission_check_flag_values.textproto
deleted file mode 100644
index acd389a2..00000000
--- a/aconfig/trunk_staging/android.app/nm_binder_perf_permission_check_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "nm_binder_perf_permission_check"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/nm_binder_perf_throttle_notify_flag_values.textproto b/aconfig/trunk_staging/android.app/nm_binder_perf_throttle_notify_flag_values.textproto
deleted file mode 100644
index c7884223..00000000
--- a/aconfig/trunk_staging/android.app/nm_binder_perf_throttle_notify_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "nm_binder_perf_throttle_notify"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/nm_summarization_flag_values.textproto b/aconfig/trunk_staging/android.app/nm_summarization_flag_values.textproto
deleted file mode 100644
index 76674adc..00000000
--- a/aconfig/trunk_staging/android.app/nm_summarization_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "nm_summarization"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/nm_summarization_ui_flag_values.textproto b/aconfig/trunk_staging/android.app/nm_summarization_ui_flag_values.textproto
deleted file mode 100644
index f059e817..00000000
--- a/aconfig/trunk_staging/android.app/nm_summarization_ui_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "nm_summarization_ui"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/no_sbnholder_flag_values.textproto b/aconfig/trunk_staging/android.app/no_sbnholder_flag_values.textproto
deleted file mode 100644
index 13822b3a..00000000
--- a/aconfig/trunk_staging/android.app/no_sbnholder_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "no_sbnholder"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/notif_channel_crop_vibration_effects_flag_values.textproto b/aconfig/trunk_staging/android.app/notif_channel_crop_vibration_effects_flag_values.textproto
deleted file mode 100644
index 7b0fbc3e..00000000
--- a/aconfig/trunk_staging/android.app/notif_channel_crop_vibration_effects_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "notif_channel_crop_vibration_effects"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/notif_channel_estimate_effect_size_flag_values.textproto b/aconfig/trunk_staging/android.app/notif_channel_estimate_effect_size_flag_values.textproto
deleted file mode 100644
index cedb26d9..00000000
--- a/aconfig/trunk_staging/android.app/notif_channel_estimate_effect_size_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "notif_channel_estimate_effect_size"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/notif_entry_creation_time_use_elapsed_realtime_flag_values.textproto b/aconfig/trunk_staging/android.app/notif_entry_creation_time_use_elapsed_realtime_flag_values.textproto
deleted file mode 100644
index 8b6ad5c4..00000000
--- a/aconfig/trunk_staging/android.app/notif_entry_creation_time_use_elapsed_realtime_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "notif_entry_creation_time_use_elapsed_realtime"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/notification_channel_vibration_effect_api_flag_values.textproto b/aconfig/trunk_staging/android.app/notification_channel_vibration_effect_api_flag_values.textproto
deleted file mode 100644
index dbdc3825..00000000
--- a/aconfig/trunk_staging/android.app/notification_channel_vibration_effect_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "notification_channel_vibration_effect_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.app/notification_classification_ui_flag_values.textproto b/aconfig/trunk_staging/android.app/notification_classification_ui_flag_values.textproto
deleted file mode 100644
index 7d71ee9c..00000000
--- a/aconfig/trunk_staging/android.app/notification_classification_ui_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "notification_classification_ui"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/notification_no_custom_view_conversations_flag_values.textproto b/aconfig/trunk_staging/android.app/notification_no_custom_view_conversations_flag_values.textproto
deleted file mode 100644
index 2dce7fed..00000000
--- a/aconfig/trunk_staging/android.app/notification_no_custom_view_conversations_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "notification_no_custom_view_conversations"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/notifications_redesign_app_icons_flag_values.textproto b/aconfig/trunk_staging/android.app/notifications_redesign_app_icons_flag_values.textproto
deleted file mode 100644
index f54a84f6..00000000
--- a/aconfig/trunk_staging/android.app/notifications_redesign_app_icons_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "notifications_redesign_app_icons"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/notifications_redesign_templates_flag_values.textproto b/aconfig/trunk_staging/android.app/notifications_redesign_templates_flag_values.textproto
deleted file mode 100644
index 64057461..00000000
--- a/aconfig/trunk_staging/android.app/notifications_redesign_templates_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "notifications_redesign_templates"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/notify_keyguard_events_flag_values.textproto b/aconfig/trunk_staging/android.app/notify_keyguard_events_flag_values.textproto
deleted file mode 100644
index d6e19d9d..00000000
--- a/aconfig/trunk_staging/android.app/notify_keyguard_events_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "notify_keyguard_events"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/pic_cache_nulls_flag_values.textproto b/aconfig/trunk_staging/android.app/pic_cache_nulls_flag_values.textproto
deleted file mode 100644
index a37ecd9b..00000000
--- a/aconfig/trunk_staging/android.app/pic_cache_nulls_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "pic_cache_nulls"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.app/pic_isolate_cache_by_uid_flag_values.textproto b/aconfig/trunk_staging/android.app/pic_isolate_cache_by_uid_flag_values.textproto
deleted file mode 100644
index 8f9a87c4..00000000
--- a/aconfig/trunk_staging/android.app/pic_isolate_cache_by_uid_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "pic_isolate_cache_by_uid"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.app/pic_separate_permission_notifications_flag_values.textproto b/aconfig/trunk_staging/android.app/pic_separate_permission_notifications_flag_values.textproto
deleted file mode 100644
index ca203f2b..00000000
--- a/aconfig/trunk_staging/android.app/pic_separate_permission_notifications_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "pic_separate_permission_notifications"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.app/pic_test_mode_flag_values.textproto b/aconfig/trunk_staging/android.app/pic_test_mode_flag_values.textproto
deleted file mode 100644
index 9bc44c80..00000000
--- a/aconfig/trunk_staging/android.app/pic_test_mode_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "pic_test_mode"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/pic_uses_shared_memory_flag_values.textproto b/aconfig/trunk_staging/android.app/pic_uses_shared_memory_flag_values.textproto
deleted file mode 100644
index 5ba3a6cf..00000000
--- a/aconfig/trunk_staging/android.app/pic_uses_shared_memory_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "pic_uses_shared_memory"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.app/pinner_service_client_api_flag_values.textproto b/aconfig/trunk_staging/android.app/pinner_service_client_api_flag_values.textproto
deleted file mode 100644
index cbfbb509..00000000
--- a/aconfig/trunk_staging/android.app/pinner_service_client_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "pinner_service_client_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/rate_limit_get_memory_info_flag_values.textproto b/aconfig/trunk_staging/android.app/rate_limit_get_memory_info_flag_values.textproto
deleted file mode 100644
index 27c26283..00000000
--- a/aconfig/trunk_staging/android.app/rate_limit_get_memory_info_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "rate_limit_get_memory_info"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.app/rate_limit_get_my_memory_state_flag_values.textproto b/aconfig/trunk_staging/android.app/rate_limit_get_my_memory_state_flag_values.textproto
deleted file mode 100644
index b08b2269..00000000
--- a/aconfig/trunk_staging/android.app/rate_limit_get_my_memory_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "rate_limit_get_my_memory_state"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.app/rate_limit_get_processes_in_error_state_flag_values.textproto b/aconfig/trunk_staging/android.app/rate_limit_get_processes_in_error_state_flag_values.textproto
deleted file mode 100644
index 460150de..00000000
--- a/aconfig/trunk_staging/android.app/rate_limit_get_processes_in_error_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "rate_limit_get_processes_in_error_state"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.app/rate_limit_get_running_app_processes_flag_values.textproto b/aconfig/trunk_staging/android.app/rate_limit_get_running_app_processes_flag_values.textproto
deleted file mode 100644
index 086791c2..00000000
--- a/aconfig/trunk_staging/android.app/rate_limit_get_running_app_processes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "rate_limit_get_running_app_processes"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.app/redact_sensitive_content_notifications_on_lockscreen_flag_values.textproto b/aconfig/trunk_staging/android.app/redact_sensitive_content_notifications_on_lockscreen_flag_values.textproto
deleted file mode 100644
index 24bccc92..00000000
--- a/aconfig/trunk_staging/android.app/redact_sensitive_content_notifications_on_lockscreen_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "redact_sensitive_content_notifications_on_lockscreen"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/redaction_on_lockscreen_metrics_flag_values.textproto b/aconfig/trunk_staging/android.app/redaction_on_lockscreen_metrics_flag_values.textproto
deleted file mode 100644
index d0abbc5c..00000000
--- a/aconfig/trunk_staging/android.app/redaction_on_lockscreen_metrics_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "redaction_on_lockscreen_metrics"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/remove_next_wallpaper_component_flag_values.textproto b/aconfig/trunk_staging/android.app/remove_next_wallpaper_component_flag_values.textproto
deleted file mode 100644
index c1d1c1b4..00000000
--- a/aconfig/trunk_staging/android.app/remove_next_wallpaper_component_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "remove_next_wallpaper_component"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/report_postgc_memory_metrics_flag_values.textproto b/aconfig/trunk_staging/android.app/report_postgc_memory_metrics_flag_values.textproto
deleted file mode 100644
index 7f07b6c3..00000000
--- a/aconfig/trunk_staging/android.app/report_postgc_memory_metrics_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "report_postgc_memory_metrics"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/restrict_audio_attributes_alarm_flag_values.textproto b/aconfig/trunk_staging/android.app/restrict_audio_attributes_alarm_flag_values.textproto
deleted file mode 100644
index d7b29f40..00000000
--- a/aconfig/trunk_staging/android.app/restrict_audio_attributes_alarm_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "restrict_audio_attributes_alarm"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/restrict_audio_attributes_call_flag_values.textproto b/aconfig/trunk_staging/android.app/restrict_audio_attributes_call_flag_values.textproto
deleted file mode 100644
index 5c7b00ce..00000000
--- a/aconfig/trunk_staging/android.app/restrict_audio_attributes_call_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "restrict_audio_attributes_call"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/restrict_audio_attributes_media_flag_values.textproto b/aconfig/trunk_staging/android.app/restrict_audio_attributes_media_flag_values.textproto
deleted file mode 100644
index 48cd3306..00000000
--- a/aconfig/trunk_staging/android.app/restrict_audio_attributes_media_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "restrict_audio_attributes_media"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/secure_allowlist_token_flag_values.textproto b/aconfig/trunk_staging/android.app/secure_allowlist_token_flag_values.textproto
deleted file mode 100644
index fc7337dc..00000000
--- a/aconfig/trunk_staging/android.app/secure_allowlist_token_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "secure_allowlist_token"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/skip_bg_mem_trim_on_fg_app_flag_values.textproto b/aconfig/trunk_staging/android.app/skip_bg_mem_trim_on_fg_app_flag_values.textproto
deleted file mode 100644
index d4331277..00000000
--- a/aconfig/trunk_staging/android.app/skip_bg_mem_trim_on_fg_app_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "skip_bg_mem_trim_on_fg_app"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.app/sort_section_by_time_flag_values.textproto b/aconfig/trunk_staging/android.app/sort_section_by_time_flag_values.textproto
deleted file mode 100644
index 9a625c68..00000000
--- a/aconfig/trunk_staging/android.app/sort_section_by_time_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "sort_section_by_time"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/system_terms_of_address_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app/system_terms_of_address_enabled_flag_values.textproto
deleted file mode 100644
index e29c20dd..00000000
--- a/aconfig/trunk_staging/android.app/system_terms_of_address_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "system_terms_of_address_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/ui_rich_ongoing_flag_values.textproto b/aconfig/trunk_staging/android.app/ui_rich_ongoing_flag_values.textproto
deleted file mode 100644
index 3f54cb73..00000000
--- a/aconfig/trunk_staging/android.app/ui_rich_ongoing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "ui_rich_ongoing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/uid_importance_listener_for_uids_flag_values.textproto b/aconfig/trunk_staging/android.app/uid_importance_listener_for_uids_flag_values.textproto
deleted file mode 100644
index bebc4e31..00000000
--- a/aconfig/trunk_staging/android.app/uid_importance_listener_for_uids_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "uid_importance_listener_for_uids"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app/use_app_info_not_launched_flag_values.textproto b/aconfig/trunk_staging/android.app/use_app_info_not_launched_flag_values.textproto
deleted file mode 100644
index 41b42931..00000000
--- a/aconfig/trunk_staging/android.app/use_app_info_not_launched_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "use_app_info_not_launched"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.app/use_sticky_bcast_cache_flag_values.textproto b/aconfig/trunk_staging/android.app/use_sticky_bcast_cache_flag_values.textproto
deleted file mode 100644
index a648d2f9..00000000
--- a/aconfig/trunk_staging/android.app/use_sticky_bcast_cache_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "use_sticky_bcast_cache"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.app/visit_person_uri_flag_values.textproto b/aconfig/trunk_staging/android.app/visit_person_uri_flag_values.textproto
deleted file mode 100644
index 8ae9f5ea..00000000
--- a/aconfig/trunk_staging/android.app/visit_person_uri_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app"
-  name: "visit_person_uri"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.appwidget.flags/Android.bp b/aconfig/trunk_staging/android.appwidget.flags/Android.bp
deleted file mode 100644
index f84c2dc3..00000000
--- a/aconfig/trunk_staging/android.appwidget.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.appwidget.flags-all",
-    package: "android.appwidget.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.appwidget.flags/check_remote_views_uri_permission_flag_values.textproto b/aconfig/trunk_staging/android.appwidget.flags/check_remote_views_uri_permission_flag_values.textproto
deleted file mode 100644
index 58fb9e33..00000000
--- a/aconfig/trunk_staging/android.appwidget.flags/check_remote_views_uri_permission_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.appwidget.flags"
-  name: "check_remote_views_uri_permission"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.appwidget.flags/draw_data_parcel_flag_values.textproto b/aconfig/trunk_staging/android.appwidget.flags/draw_data_parcel_flag_values.textproto
deleted file mode 100644
index 878d6d72..00000000
--- a/aconfig/trunk_staging/android.appwidget.flags/draw_data_parcel_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.appwidget.flags"
-  name: "draw_data_parcel"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.appwidget.flags/engagement_metrics_flag_values.textproto b/aconfig/trunk_staging/android.appwidget.flags/engagement_metrics_flag_values.textproto
deleted file mode 100644
index ee42ff08..00000000
--- a/aconfig/trunk_staging/android.appwidget.flags/engagement_metrics_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.appwidget.flags"
-  name: "engagement_metrics"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.appwidget.flags/generated_previews_flag_values.textproto b/aconfig/trunk_staging/android.appwidget.flags/generated_previews_flag_values.textproto
deleted file mode 100644
index a7650f19..00000000
--- a/aconfig/trunk_staging/android.appwidget.flags/generated_previews_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.appwidget.flags"
-  name: "generated_previews"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.appwidget.flags/not_keyguard_category_flag_values.textproto b/aconfig/trunk_staging/android.appwidget.flags/not_keyguard_category_flag_values.textproto
deleted file mode 100644
index 41a6c385..00000000
--- a/aconfig/trunk_staging/android.appwidget.flags/not_keyguard_category_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.appwidget.flags"
-  name: "not_keyguard_category"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.appwidget.flags/remote_adapter_conversion_flag_values.textproto b/aconfig/trunk_staging/android.appwidget.flags/remote_adapter_conversion_flag_values.textproto
deleted file mode 100644
index 835318e6..00000000
--- a/aconfig/trunk_staging/android.appwidget.flags/remote_adapter_conversion_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.appwidget.flags"
-  name: "remote_adapter_conversion"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.appwidget.flags/remote_document_support_flag_values.textproto b/aconfig/trunk_staging/android.appwidget.flags/remote_document_support_flag_values.textproto
deleted file mode 100644
index d397a458..00000000
--- a/aconfig/trunk_staging/android.appwidget.flags/remote_document_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.appwidget.flags"
-  name: "remote_document_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.appwidget.flags/remote_views_proto_flag_values.textproto b/aconfig/trunk_staging/android.appwidget.flags/remote_views_proto_flag_values.textproto
deleted file mode 100644
index d17b3059..00000000
--- a/aconfig/trunk_staging/android.appwidget.flags/remote_views_proto_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.appwidget.flags"
-  name: "remote_views_proto"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.appwidget.flags/remove_app_widget_service_io_from_critical_path_flag_values.textproto b/aconfig/trunk_staging/android.appwidget.flags/remove_app_widget_service_io_from_critical_path_flag_values.textproto
deleted file mode 100644
index bef2e38b..00000000
--- a/aconfig/trunk_staging/android.appwidget.flags/remove_app_widget_service_io_from_critical_path_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.appwidget.flags"
-  name: "remove_app_widget_service_io_from_critical_path"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.appwidget.flags/security_policy_interact_across_users_flag_values.textproto b/aconfig/trunk_staging/android.appwidget.flags/security_policy_interact_across_users_flag_values.textproto
deleted file mode 100644
index 54a95a43..00000000
--- a/aconfig/trunk_staging/android.appwidget.flags/security_policy_interact_across_users_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.appwidget.flags"
-  name: "security_policy_interact_across_users"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.appwidget.flags/use_smaller_app_widget_system_radius_flag_values.textproto b/aconfig/trunk_staging/android.appwidget.flags/use_smaller_app_widget_system_radius_flag_values.textproto
deleted file mode 100644
index 19aa1157..00000000
--- a/aconfig/trunk_staging/android.appwidget.flags/use_smaller_app_widget_system_radius_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.appwidget.flags"
-  name: "use_smaller_app_widget_system_radius"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.car.feature/Android.bp b/aconfig/trunk_staging/android.car.feature/Android.bp
deleted file mode 100644
index be94ba9e..00000000
--- a/aconfig/trunk_staging/android.car.feature/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.car.feature-all",
-    package: "android.car.feature",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.car.feature/android_b_vehicle_properties_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/android_b_vehicle_properties_flag_values.textproto
deleted file mode 100644
index 34225d21..00000000
--- a/aconfig/trunk_staging/android.car.feature/android_b_vehicle_properties_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "android_b_vehicle_properties"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/android_vic_vehicle_properties_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/android_vic_vehicle_properties_flag_values.textproto
deleted file mode 100644
index 4bc797d9..00000000
--- a/aconfig/trunk_staging/android.car.feature/android_vic_vehicle_properties_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "android_vic_vehicle_properties"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/area_id_config_access_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/area_id_config_access_flag_values.textproto
deleted file mode 100644
index ab7939db..00000000
--- a/aconfig/trunk_staging/android.car.feature/area_id_config_access_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "area_id_config_access"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/audio_vendor_freeze_improvements_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/audio_vendor_freeze_improvements_flag_values.textproto
deleted file mode 100644
index 7facb99e..00000000
--- a/aconfig/trunk_staging/android.car.feature/audio_vendor_freeze_improvements_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "audio_vendor_freeze_improvements"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/batched_subscriptions_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/batched_subscriptions_flag_values.textproto
deleted file mode 100644
index fab937ef..00000000
--- a/aconfig/trunk_staging/android.car.feature/batched_subscriptions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "batched_subscriptions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/car_app_card_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/car_app_card_flag_values.textproto
deleted file mode 100644
index 87dea1d0..00000000
--- a/aconfig/trunk_staging/android.car.feature/car_app_card_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "car_app_card"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/car_audio_dynamic_devices_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/car_audio_dynamic_devices_flag_values.textproto
deleted file mode 100644
index 32e32245..00000000
--- a/aconfig/trunk_staging/android.car.feature/car_audio_dynamic_devices_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "car_audio_dynamic_devices"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/car_audio_fade_manager_configuration_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/car_audio_fade_manager_configuration_flag_values.textproto
deleted file mode 100644
index 3c80e4f9..00000000
--- a/aconfig/trunk_staging/android.car.feature/car_audio_fade_manager_configuration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "car_audio_fade_manager_configuration"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/car_audio_min_max_activation_volume_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/car_audio_min_max_activation_volume_flag_values.textproto
deleted file mode 100644
index 48e073b7..00000000
--- a/aconfig/trunk_staging/android.car.feature/car_audio_min_max_activation_volume_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "car_audio_min_max_activation_volume"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/car_audio_mute_ambiguity_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/car_audio_mute_ambiguity_flag_values.textproto
deleted file mode 100644
index 3aaf99b4..00000000
--- a/aconfig/trunk_staging/android.car.feature/car_audio_mute_ambiguity_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "car_audio_mute_ambiguity"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/car_dump_to_proto_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/car_dump_to_proto_flag_values.textproto
deleted file mode 100644
index 21d9a3a1..00000000
--- a/aconfig/trunk_staging/android.car.feature/car_dump_to_proto_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "car_dump_to_proto"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/car_evs_query_service_status_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/car_evs_query_service_status_flag_values.textproto
deleted file mode 100644
index 0b8cf243..00000000
--- a/aconfig/trunk_staging/android.car.feature/car_evs_query_service_status_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "car_evs_query_service_status"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/car_evs_stream_management_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/car_evs_stream_management_flag_values.textproto
deleted file mode 100644
index d125719f..00000000
--- a/aconfig/trunk_staging/android.car.feature/car_evs_stream_management_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "car_evs_stream_management"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/car_input_start_btpairing_lptt_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/car_input_start_btpairing_lptt_flag_values.textproto
deleted file mode 100644
index 3beffb1b..00000000
--- a/aconfig/trunk_staging/android.car.feature/car_input_start_btpairing_lptt_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "car_input_start_btpairing_lptt"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/car_night_global_setting_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/car_night_global_setting_flag_values.textproto
deleted file mode 100644
index 3b21ec02..00000000
--- a/aconfig/trunk_staging/android.car.feature/car_night_global_setting_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "car_night_global_setting"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/car_power_policy_refactoring_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/car_power_policy_refactoring_flag_values.textproto
deleted file mode 100644
index 2569d848..00000000
--- a/aconfig/trunk_staging/android.car.feature/car_power_policy_refactoring_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "car_power_policy_refactoring"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/car_property_detailed_error_codes_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/car_property_detailed_error_codes_flag_values.textproto
deleted file mode 100644
index 9b0892c1..00000000
--- a/aconfig/trunk_staging/android.car.feature/car_property_detailed_error_codes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "car_property_detailed_error_codes"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/car_property_value_property_status_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/car_property_value_property_status_flag_values.textproto
deleted file mode 100644
index 86f18ace..00000000
--- a/aconfig/trunk_staging/android.car.feature/car_property_value_property_status_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "car_property_value_property_status"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/car_watchdog_memory_profiling_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/car_watchdog_memory_profiling_flag_values.textproto
deleted file mode 100644
index b7892dcf..00000000
--- a/aconfig/trunk_staging/android.car.feature/car_watchdog_memory_profiling_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "car_watchdog_memory_profiling"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/cluster_health_monitoring_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/cluster_health_monitoring_flag_values.textproto
deleted file mode 100644
index 4c03eb07..00000000
--- a/aconfig/trunk_staging/android.car.feature/cluster_health_monitoring_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "cluster_health_monitoring"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/display_compatibility_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/display_compatibility_flag_values.textproto
deleted file mode 100644
index edcdb37d..00000000
--- a/aconfig/trunk_staging/android.car.feature/display_compatibility_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "display_compatibility"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/distant_display_transitions_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/distant_display_transitions_flag_values.textproto
deleted file mode 100644
index 77de8d2a..00000000
--- a/aconfig/trunk_staging/android.car.feature/distant_display_transitions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "distant_display_transitions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/multi_display_brightness_control_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/multi_display_brightness_control_flag_values.textproto
deleted file mode 100644
index 27cff08a..00000000
--- a/aconfig/trunk_staging/android.car.feature/multi_display_brightness_control_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "multi_display_brightness_control"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/package_manager_extensions_for_sdv_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/package_manager_extensions_for_sdv_flag_values.textproto
deleted file mode 100644
index cc606ee3..00000000
--- a/aconfig/trunk_staging/android.car.feature/package_manager_extensions_for_sdv_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "package_manager_extensions_for_sdv"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/per_display_max_brightness_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/per_display_max_brightness_flag_values.textproto
deleted file mode 100644
index bcbf8af8..00000000
--- a/aconfig/trunk_staging/android.car.feature/per_display_max_brightness_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "per_display_max_brightness"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/persist_ap_settings_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/persist_ap_settings_flag_values.textproto
deleted file mode 100644
index 10c13f0b..00000000
--- a/aconfig/trunk_staging/android.car.feature/persist_ap_settings_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "persist_ap_settings"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/projection_query_bt_profile_inhibit_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/projection_query_bt_profile_inhibit_flag_values.textproto
deleted file mode 100644
index bfa61265..00000000
--- a/aconfig/trunk_staging/android.car.feature/projection_query_bt_profile_inhibit_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "projection_query_bt_profile_inhibit"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/serverless_remote_access_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/serverless_remote_access_flag_values.textproto
deleted file mode 100644
index c6dec9c2..00000000
--- a/aconfig/trunk_staging/android.car.feature/serverless_remote_access_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "serverless_remote_access"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/subscription_with_resolution_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/subscription_with_resolution_flag_values.textproto
deleted file mode 100644
index d2e8c767..00000000
--- a/aconfig/trunk_staging/android.car.feature/subscription_with_resolution_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "subscription_with_resolution"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/supports_secure_passenger_users_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/supports_secure_passenger_users_flag_values.textproto
deleted file mode 100644
index f9dd5d7f..00000000
--- a/aconfig/trunk_staging/android.car.feature/supports_secure_passenger_users_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "supports_secure_passenger_users"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/switch_user_ignoring_uxr_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/switch_user_ignoring_uxr_flag_values.textproto
deleted file mode 100644
index e39a5e3e..00000000
--- a/aconfig/trunk_staging/android.car.feature/switch_user_ignoring_uxr_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "switch_user_ignoring_uxr"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/task_view_task_reordering_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/task_view_task_reordering_flag_values.textproto
deleted file mode 100644
index 75f29683..00000000
--- a/aconfig/trunk_staging/android.car.feature/task_view_task_reordering_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "task_view_task_reordering"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/variable_update_rate_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/variable_update_rate_flag_values.textproto
deleted file mode 100644
index 18443c6a..00000000
--- a/aconfig/trunk_staging/android.car.feature/variable_update_rate_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "variable_update_rate"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/vehicle_property_25q2_3p_permissions_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/vehicle_property_25q2_3p_permissions_flag_values.textproto
deleted file mode 100644
index 3ada0ffd..00000000
--- a/aconfig/trunk_staging/android.car.feature/vehicle_property_25q2_3p_permissions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "vehicle_property_25q2_3p_permissions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/vehicle_property_remove_system_api_tags_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/vehicle_property_remove_system_api_tags_flag_values.textproto
deleted file mode 100644
index 014a11c1..00000000
--- a/aconfig/trunk_staging/android.car.feature/vehicle_property_remove_system_api_tags_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "vehicle_property_remove_system_api_tags"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.car.feature/visible_background_user_restrictions_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/visible_background_user_restrictions_flag_values.textproto
deleted file mode 100644
index 6bb0a3ce..00000000
--- a/aconfig/trunk_staging/android.car.feature/visible_background_user_restrictions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.car.feature"
-  name: "visible_background_user_restrictions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.chre.flags/Android.bp b/aconfig/trunk_staging/android.chre.flags/Android.bp
deleted file mode 100644
index f4fc47a8..00000000
--- a/aconfig/trunk_staging/android.chre.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.chre.flags-all",
-    package: "android.chre.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.chre.flags/abort_if_no_context_hub_found_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/abort_if_no_context_hub_found_flag_values.textproto
deleted file mode 100644
index 9465059b..00000000
--- a/aconfig/trunk_staging/android.chre.flags/abort_if_no_context_hub_found_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.chre.flags"
-  name: "abort_if_no_context_hub_found"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.chre.flags/bug_fix_hal_reliable_message_record_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/bug_fix_hal_reliable_message_record_flag_values.textproto
deleted file mode 100644
index b7515289..00000000
--- a/aconfig/trunk_staging/android.chre.flags/bug_fix_hal_reliable_message_record_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.chre.flags"
-  name: "bug_fix_hal_reliable_message_record"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.chre.flags/bug_fix_reduce_lock_holding_period_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/bug_fix_reduce_lock_holding_period_flag_values.textproto
deleted file mode 100644
index 779cd745..00000000
--- a/aconfig/trunk_staging/android.chre.flags/bug_fix_reduce_lock_holding_period_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.chre.flags"
-  name: "bug_fix_reduce_lock_holding_period"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.chre.flags/bug_fix_remove_exit_call_in_hal_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/bug_fix_remove_exit_call_in_hal_flag_values.textproto
deleted file mode 100644
index 46f7b81d..00000000
--- a/aconfig/trunk_staging/android.chre.flags/bug_fix_remove_exit_call_in_hal_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.chre.flags"
-  name: "bug_fix_remove_exit_call_in_hal"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.chre.flags/context_hub_callback_uuid_enabled_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/context_hub_callback_uuid_enabled_flag_values.textproto
deleted file mode 100644
index 50ad0821..00000000
--- a/aconfig/trunk_staging/android.chre.flags/context_hub_callback_uuid_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.chre.flags"
-  name: "context_hub_callback_uuid_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.chre.flags/efw_xport_in_context_hub_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/efw_xport_in_context_hub_flag_values.textproto
deleted file mode 100644
index afac6719..00000000
--- a/aconfig/trunk_staging/android.chre.flags/efw_xport_in_context_hub_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.chre.flags"
-  name: "efw_xport_in_context_hub"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.chre.flags/efw_xport_rewind_on_error_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/efw_xport_rewind_on_error_flag_values.textproto
deleted file mode 100644
index beea7f03..00000000
--- a/aconfig/trunk_staging/android.chre.flags/efw_xport_rewind_on_error_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.chre.flags"
-  name: "efw_xport_rewind_on_error"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.chre.flags/fix_api_check_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/fix_api_check_flag_values.textproto
deleted file mode 100644
index 4f68a4fd..00000000
--- a/aconfig/trunk_staging/android.chre.flags/fix_api_check_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.chre.flags"
-  name: "fix_api_check"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.chre.flags/flag_log_nanoapp_load_metrics_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/flag_log_nanoapp_load_metrics_flag_values.textproto
deleted file mode 100644
index 5b547757..00000000
--- a/aconfig/trunk_staging/android.chre.flags/flag_log_nanoapp_load_metrics_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.chre.flags"
-  name: "flag_log_nanoapp_load_metrics"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.chre.flags/metrics_reporter_in_the_daemon_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/metrics_reporter_in_the_daemon_flag_values.textproto
deleted file mode 100644
index e5e50f3e..00000000
--- a/aconfig/trunk_staging/android.chre.flags/metrics_reporter_in_the_daemon_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.chre.flags"
-  name: "metrics_reporter_in_the_daemon"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.chre.flags/offload_api_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/offload_api_flag_values.textproto
deleted file mode 100644
index c5b7047b..00000000
--- a/aconfig/trunk_staging/android.chre.flags/offload_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.chre.flags"
-  name: "offload_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.chre.flags/offload_implementation_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/offload_implementation_flag_values.textproto
deleted file mode 100644
index adf395df..00000000
--- a/aconfig/trunk_staging/android.chre.flags/offload_implementation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.chre.flags"
-  name: "offload_implementation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.chre.flags/reconnect_host_endpoints_after_hal_restart_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/reconnect_host_endpoints_after_hal_restart_flag_values.textproto
deleted file mode 100644
index a05d223a..00000000
--- a/aconfig/trunk_staging/android.chre.flags/reconnect_host_endpoints_after_hal_restart_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.chre.flags"
-  name: "reconnect_host_endpoints_after_hal_restart"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.chre.flags/reduce_locking_context_hub_transaction_manager_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/reduce_locking_context_hub_transaction_manager_flag_values.textproto
deleted file mode 100644
index 5eee7dba..00000000
--- a/aconfig/trunk_staging/android.chre.flags/reduce_locking_context_hub_transaction_manager_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.chre.flags"
-  name: "reduce_locking_context_hub_transaction_manager"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.chre.flags/refactor_hal_xport_agnostic_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/refactor_hal_xport_agnostic_flag_values.textproto
deleted file mode 100644
index 68e5cd89..00000000
--- a/aconfig/trunk_staging/android.chre.flags/refactor_hal_xport_agnostic_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.chre.flags"
-  name: "refactor_hal_xport_agnostic"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.chre.flags/reliable_message_duplicate_detection_service_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/reliable_message_duplicate_detection_service_flag_values.textproto
deleted file mode 100644
index 69915c0a..00000000
--- a/aconfig/trunk_staging/android.chre.flags/reliable_message_duplicate_detection_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.chre.flags"
-  name: "reliable_message_duplicate_detection_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.chre.flags/reliable_message_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/reliable_message_flag_values.textproto
deleted file mode 100644
index 63a8cb02..00000000
--- a/aconfig/trunk_staging/android.chre.flags/reliable_message_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.chre.flags"
-  name: "reliable_message"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.chre.flags/reliable_message_implementation_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/reliable_message_implementation_flag_values.textproto
deleted file mode 100644
index dfe3b4df..00000000
--- a/aconfig/trunk_staging/android.chre.flags/reliable_message_implementation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.chre.flags"
-  name: "reliable_message_implementation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.chre.flags/reliable_message_retry_support_service_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/reliable_message_retry_support_service_flag_values.textproto
deleted file mode 100644
index 68754601..00000000
--- a/aconfig/trunk_staging/android.chre.flags/reliable_message_retry_support_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.chre.flags"
-  name: "reliable_message_retry_support_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.chre.flags/reliable_message_test_mode_behavior_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/reliable_message_test_mode_behavior_flag_values.textproto
deleted file mode 100644
index ab06f505..00000000
--- a/aconfig/trunk_staging/android.chre.flags/reliable_message_test_mode_behavior_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.chre.flags"
-  name: "reliable_message_test_mode_behavior"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.chre.flags/remove_ap_wakeup_metric_report_limit_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/remove_ap_wakeup_metric_report_limit_flag_values.textproto
deleted file mode 100644
index a6777997..00000000
--- a/aconfig/trunk_staging/android.chre.flags/remove_ap_wakeup_metric_report_limit_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.chre.flags"
-  name: "remove_ap_wakeup_metric_report_limit"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtual.flags/Android.bp b/aconfig/trunk_staging/android.companion.virtual.flags/Android.bp
deleted file mode 100644
index 6aa16d2a..00000000
--- a/aconfig/trunk_staging/android.companion.virtual.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-android.companion.virtual.flags-all",
-  package: "android.companion.virtual.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/android.companion.virtual.flags/consistent_display_flags_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtual.flags/consistent_display_flags_flag_values.textproto
deleted file mode 100644
index 6d284a3e..00000000
--- a/aconfig/trunk_staging/android.companion.virtual.flags/consistent_display_flags_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtual.flags"
-  name: "consistent_display_flags"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtual.flags/cross_device_clipboard_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtual.flags/cross_device_clipboard_flag_values.textproto
deleted file mode 100644
index f1f5162e..00000000
--- a/aconfig/trunk_staging/android.companion.virtual.flags/cross_device_clipboard_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtual.flags"
-  name: "cross_device_clipboard"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtual.flags/dynamic_policy_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtual.flags/dynamic_policy_flag_values.textproto
deleted file mode 100644
index 6c5eb789..00000000
--- a/aconfig/trunk_staging/android.companion.virtual.flags/dynamic_policy_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtual.flags"
-  name: "dynamic_policy"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtual.flags/enable_native_vdm_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtual.flags/enable_native_vdm_flag_values.textproto
deleted file mode 100644
index 7e0fa285..00000000
--- a/aconfig/trunk_staging/android.companion.virtual.flags/enable_native_vdm_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtual.flags"
-  name: "enable_native_vdm"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.companion.virtual.flags/express_metrics_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtual.flags/express_metrics_flag_values.textproto
deleted file mode 100644
index 8d44be57..00000000
--- a/aconfig/trunk_staging/android.companion.virtual.flags/express_metrics_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtual.flags"
-  name: "express_metrics"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtual.flags/impulse_velocity_strategy_for_touch_navigation_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtual.flags/impulse_velocity_strategy_for_touch_navigation_flag_values.textproto
deleted file mode 100644
index a69d7330..00000000
--- a/aconfig/trunk_staging/android.companion.virtual.flags/impulse_velocity_strategy_for_touch_navigation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtual.flags"
-  name: "impulse_velocity_strategy_for_touch_navigation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtual.flags/interactive_screen_mirror_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtual.flags/interactive_screen_mirror_flag_values.textproto
deleted file mode 100644
index c826b8fc..00000000
--- a/aconfig/trunk_staging/android.companion.virtual.flags/interactive_screen_mirror_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtual.flags"
-  name: "interactive_screen_mirror"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtual.flags/intercept_intents_before_applying_policy_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtual.flags/intercept_intents_before_applying_policy_flag_values.textproto
deleted file mode 100644
index 206962f8..00000000
--- a/aconfig/trunk_staging/android.companion.virtual.flags/intercept_intents_before_applying_policy_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtual.flags"
-  name: "intercept_intents_before_applying_policy"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtual.flags/persistent_device_id_api_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtual.flags/persistent_device_id_api_flag_values.textproto
deleted file mode 100644
index 7589aee4..00000000
--- a/aconfig/trunk_staging/android.companion.virtual.flags/persistent_device_id_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtual.flags"
-  name: "persistent_device_id_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtual.flags/stream_permissions_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtual.flags/stream_permissions_flag_values.textproto
deleted file mode 100644
index 15b8a850..00000000
--- a/aconfig/trunk_staging/android.companion.virtual.flags/stream_permissions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtual.flags"
-  name: "stream_permissions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtual.flags/vdm_custom_home_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtual.flags/vdm_custom_home_flag_values.textproto
deleted file mode 100644
index a4ff2d9b..00000000
--- a/aconfig/trunk_staging/android.companion.virtual.flags/vdm_custom_home_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtual.flags"
-  name: "vdm_custom_home"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtual.flags/vdm_custom_ime_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtual.flags/vdm_custom_ime_flag_values.textproto
deleted file mode 100644
index 81f40ff4..00000000
--- a/aconfig/trunk_staging/android.companion.virtual.flags/vdm_custom_ime_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtual.flags"
-  name: "vdm_custom_ime"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtual.flags/vdm_public_apis_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtual.flags/vdm_public_apis_flag_values.textproto
deleted file mode 100644
index be13b8a4..00000000
--- a/aconfig/trunk_staging/android.companion.virtual.flags/vdm_public_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtual.flags"
-  name: "vdm_public_apis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtual.flags/virtual_camera_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtual.flags/virtual_camera_flag_values.textproto
deleted file mode 100644
index c8fa897d..00000000
--- a/aconfig/trunk_staging/android.companion.virtual.flags/virtual_camera_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtual.flags"
-  name: "virtual_camera"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtual.flags/virtual_stylus_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtual.flags/virtual_stylus_flag_values.textproto
deleted file mode 100644
index b4b8a3af..00000000
--- a/aconfig/trunk_staging/android.companion.virtual.flags/virtual_stylus_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtual.flags"
-  name: "virtual_stylus"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/Android.bp b/aconfig/trunk_staging/android.companion.virtualdevice.flags/Android.bp
deleted file mode 100644
index 05eb7f02..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.companion.virtualdevice.flags-all",
-    package: "android.companion.virtualdevice.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/activity_control_api_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/activity_control_api_flag_values.textproto
deleted file mode 100644
index adb10067..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/activity_control_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "activity_control_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/camera_device_awareness_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/camera_device_awareness_flag_values.textproto
deleted file mode 100644
index d65767c7..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/camera_device_awareness_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "camera_device_awareness"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/camera_multiple_input_streams_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/camera_multiple_input_streams_flag_values.textproto
deleted file mode 100644
index cb705b3f..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/camera_multiple_input_streams_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "camera_multiple_input_streams"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/camera_timestamp_from_surface_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/camera_timestamp_from_surface_flag_values.textproto
deleted file mode 100644
index eaae37af..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/camera_timestamp_from_surface_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "camera_timestamp_from_surface"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/correct_virtual_display_power_state_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/correct_virtual_display_power_state_flag_values.textproto
deleted file mode 100644
index 02e34598..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/correct_virtual_display_power_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "correct_virtual_display_power_state"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/default_device_camera_access_policy_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/default_device_camera_access_policy_flag_values.textproto
deleted file mode 100644
index 59eb0dc8..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/default_device_camera_access_policy_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "default_device_camera_access_policy"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/device_aware_display_power_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/device_aware_display_power_flag_values.textproto
deleted file mode 100644
index fc006060..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/device_aware_display_power_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "device_aware_display_power"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/device_aware_drm_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/device_aware_drm_flag_values.textproto
deleted file mode 100644
index 03f129fe..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/device_aware_drm_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "device_aware_drm"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/device_aware_record_audio_permission_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/device_aware_record_audio_permission_flag_values.textproto
deleted file mode 100644
index 3357b94d..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/device_aware_record_audio_permission_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "device_aware_record_audio_permission"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/device_aware_settings_override_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/device_aware_settings_override_flag_values.textproto
deleted file mode 100644
index 473fd288..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/device_aware_settings_override_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "device_aware_settings_override"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/display_power_manager_apis_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/display_power_manager_apis_flag_values.textproto
deleted file mode 100644
index 8ae10ee3..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/display_power_manager_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "display_power_manager_apis"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/enable_limited_vdm_role_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/enable_limited_vdm_role_flag_values.textproto
deleted file mode 100644
index 8cf69858..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/enable_limited_vdm_role_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "enable_limited_vdm_role"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/enforce_remote_device_opt_out_on_all_virtual_displays_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/enforce_remote_device_opt_out_on_all_virtual_displays_flag_values.textproto
deleted file mode 100644
index 0f785122..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/enforce_remote_device_opt_out_on_all_virtual_displays_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "enforce_remote_device_opt_out_on_all_virtual_displays"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/high_resolution_scroll_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/high_resolution_scroll_flag_values.textproto
deleted file mode 100644
index 05fa8d6c..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/high_resolution_scroll_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "high_resolution_scroll"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/intent_interception_action_matching_fix_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/intent_interception_action_matching_fix_flag_values.textproto
deleted file mode 100644
index c1bd30e4..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/intent_interception_action_matching_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "intent_interception_action_matching_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/media_projection_keyguard_restrictions_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/media_projection_keyguard_restrictions_flag_values.textproto
deleted file mode 100644
index 8ca4fb8b..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/media_projection_keyguard_restrictions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "media_projection_keyguard_restrictions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/metrics_collection_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/metrics_collection_flag_values.textproto
deleted file mode 100644
index ff413d9d..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/metrics_collection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "metrics_collection"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/migrate_viewconfiguration_constants_to_resources_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/migrate_viewconfiguration_constants_to_resources_flag_values.textproto
deleted file mode 100644
index 402ed3d0..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/migrate_viewconfiguration_constants_to_resources_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "migrate_viewconfiguration_constants_to_resources"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/notifications_for_device_streaming_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/notifications_for_device_streaming_flag_values.textproto
deleted file mode 100644
index 7b048354..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/notifications_for_device_streaming_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "notifications_for_device_streaming"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/status_bar_and_insets_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/status_bar_and_insets_flag_values.textproto
deleted file mode 100644
index b7f3219c..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/status_bar_and_insets_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "status_bar_and_insets"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/vdm_settings_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/vdm_settings_flag_values.textproto
deleted file mode 100644
index 761a07df..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/vdm_settings_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "vdm_settings"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/viewconfiguration_apis_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/viewconfiguration_apis_flag_values.textproto
deleted file mode 100644
index a1b45a0d..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/viewconfiguration_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "viewconfiguration_apis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_camera_service_discovery_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_camera_service_discovery_flag_values.textproto
deleted file mode 100644
index 307aa55c..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_camera_service_discovery_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "virtual_camera_service_discovery"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_display_insets_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_display_insets_flag_values.textproto
deleted file mode 100644
index d6105d84..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_display_insets_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "virtual_display_insets"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_display_multi_window_mode_support_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_display_multi_window_mode_support_flag_values.textproto
deleted file mode 100644
index 88a72cbf..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_display_multi_window_mode_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "virtual_display_multi_window_mode_support"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_display_rotation_api_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_display_rotation_api_flag_values.textproto
deleted file mode 100644
index f451dda2..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_display_rotation_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "virtual_display_rotation_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_rotary_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_rotary_flag_values.textproto
deleted file mode 100644
index 94db58af..00000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_rotary_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "virtual_rotary"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion/Android.bp b/aconfig/trunk_staging/android.companion/Android.bp
deleted file mode 100644
index 2a31a5f7..00000000
--- a/aconfig/trunk_staging/android.companion/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.companion-all",
-    package: "android.companion",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.companion/association_device_icon_flag_values.textproto b/aconfig/trunk_staging/android.companion/association_device_icon_flag_values.textproto
deleted file mode 100644
index edf3b061..00000000
--- a/aconfig/trunk_staging/android.companion/association_device_icon_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion"
-  name: "association_device_icon"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion/association_failure_code_flag_values.textproto b/aconfig/trunk_staging/android.companion/association_failure_code_flag_values.textproto
deleted file mode 100644
index b5ad883b..00000000
--- a/aconfig/trunk_staging/android.companion/association_failure_code_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion"
-  name: "association_failure_code"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion/association_tag_flag_values.textproto b/aconfig/trunk_staging/android.companion/association_tag_flag_values.textproto
deleted file mode 100644
index b2251052..00000000
--- a/aconfig/trunk_staging/android.companion/association_tag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion"
-  name: "association_tag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion/companion_transport_apis_flag_values.textproto b/aconfig/trunk_staging/android.companion/companion_transport_apis_flag_values.textproto
deleted file mode 100644
index 38effbad..00000000
--- a/aconfig/trunk_staging/android.companion/companion_transport_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion"
-  name: "companion_transport_apis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion/device_presence_flag_values.textproto b/aconfig/trunk_staging/android.companion/device_presence_flag_values.textproto
deleted file mode 100644
index 18d04cc5..00000000
--- a/aconfig/trunk_staging/android.companion/device_presence_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion"
-  name: "device_presence"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion/new_association_builder_flag_values.textproto b/aconfig/trunk_staging/android.companion/new_association_builder_flag_values.textproto
deleted file mode 100644
index ac8dd2a9..00000000
--- a/aconfig/trunk_staging/android.companion/new_association_builder_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion"
-  name: "new_association_builder"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion/perm_sync_user_consent_flag_values.textproto b/aconfig/trunk_staging/android.companion/perm_sync_user_consent_flag_values.textproto
deleted file mode 100644
index 3fc26554..00000000
--- a/aconfig/trunk_staging/android.companion/perm_sync_user_consent_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion"
-  name: "perm_sync_user_consent"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion/unpair_associated_device_flag_values.textproto b/aconfig/trunk_staging/android.companion/unpair_associated_device_flag_values.textproto
deleted file mode 100644
index e0fcaed1..00000000
--- a/aconfig/trunk_staging/android.companion/unpair_associated_device_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion"
-  name: "unpair_associated_device"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.flags/Android.bp b/aconfig/trunk_staging/android.content.flags/Android.bp
deleted file mode 100644
index 4e78c126..00000000
--- a/aconfig/trunk_staging/android.content.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.content.flags-all",
-    package: "android.content.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.content.flags/enable_bind_package_isolated_process_flag_values.textproto b/aconfig/trunk_staging/android.content.flags/enable_bind_package_isolated_process_flag_values.textproto
deleted file mode 100644
index 45cfa746..00000000
--- a/aconfig/trunk_staging/android.content.flags/enable_bind_package_isolated_process_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.flags"
-  name: "enable_bind_package_isolated_process"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.flags/intent_save_to_xml_package_flag_values.textproto b/aconfig/trunk_staging/android.content.flags/intent_save_to_xml_package_flag_values.textproto
deleted file mode 100644
index 1faf822b..00000000
--- a/aconfig/trunk_staging/android.content.flags/intent_save_to_xml_package_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.flags"
-  name: "intent_save_to_xml_package"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.pm/Android.bp b/aconfig/trunk_staging/android.content.pm/Android.bp
deleted file mode 100644
index 583c6961..00000000
--- a/aconfig/trunk_staging/android.content.pm/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.content.pm-all",
-    package: "android.content.pm",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.content.pm/allow_sdk_sandbox_query_intent_activities_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/allow_sdk_sandbox_query_intent_activities_flag_values.textproto
deleted file mode 100644
index 15328ff3..00000000
--- a/aconfig/trunk_staging/android.content.pm/allow_sdk_sandbox_query_intent_activities_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "allow_sdk_sandbox_query_intent_activities"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.pm/always_load_past_certs_v4_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/always_load_past_certs_v4_flag_values.textproto
deleted file mode 100644
index 469e7e78..00000000
--- a/aconfig/trunk_staging/android.content.pm/always_load_past_certs_v4_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "always_load_past_certs_v4"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.pm/app_compat_option_16kb_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/app_compat_option_16kb_flag_values.textproto
deleted file mode 100644
index c8fe619a..00000000
--- a/aconfig/trunk_staging/android.content.pm/app_compat_option_16kb_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "app_compat_option_16kb"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.pm/archiving_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/archiving_flag_values.textproto
deleted file mode 100644
index 72764871..00000000
--- a/aconfig/trunk_staging/android.content.pm/archiving_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "archiving"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.pm/asl_in_apk_app_metadata_source_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/asl_in_apk_app_metadata_source_flag_values.textproto
deleted file mode 100644
index 379d2d0f..00000000
--- a/aconfig/trunk_staging/android.content.pm/asl_in_apk_app_metadata_source_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "asl_in_apk_app_metadata_source"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.pm/cache_sdk_system_features_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/cache_sdk_system_features_flag_values.textproto
deleted file mode 100644
index 2256f08d..00000000
--- a/aconfig/trunk_staging/android.content.pm/cache_sdk_system_features_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "cache_sdk_system_features"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.pm/change_launcher_badging_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/change_launcher_badging_flag_values.textproto
deleted file mode 100644
index 14909cd5..00000000
--- a/aconfig/trunk_staging/android.content.pm/change_launcher_badging_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "change_launcher_badging"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.pm/cloud_compilation_pm_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/cloud_compilation_pm_flag_values.textproto
deleted file mode 100644
index 42da609b..00000000
--- a/aconfig/trunk_staging/android.content.pm/cloud_compilation_pm_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "cloud_compilation_pm"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.pm/cloud_compilation_verification_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/cloud_compilation_verification_flag_values.textproto
deleted file mode 100644
index 7e447f86..00000000
--- a/aconfig/trunk_staging/android.content.pm/cloud_compilation_verification_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "cloud_compilation_verification"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.pm/component_state_changed_metrics_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/component_state_changed_metrics_flag_values.textproto
deleted file mode 100644
index dfa1c5f0..00000000
--- a/aconfig/trunk_staging/android.content.pm/component_state_changed_metrics_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "component_state_changed_metrics"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.pm/delete_packages_silently_backport_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/delete_packages_silently_backport_flag_values.textproto
deleted file mode 100644
index 3c34c9a3..00000000
--- a/aconfig/trunk_staging/android.content.pm/delete_packages_silently_backport_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "delete_packages_silently_backport"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.pm/emergency_install_permission_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/emergency_install_permission_flag_values.textproto
deleted file mode 100644
index 922c4d58..00000000
--- a/aconfig/trunk_staging/android.content.pm/emergency_install_permission_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "emergency_install_permission"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.pm/encode_app_intent_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/encode_app_intent_flag_values.textproto
deleted file mode 100644
index b1f50592..00000000
--- a/aconfig/trunk_staging/android.content.pm/encode_app_intent_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "encode_app_intent"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.pm/fix_duplicated_flags_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/fix_duplicated_flags_flag_values.textproto
deleted file mode 100644
index 196abe43..00000000
--- a/aconfig/trunk_staging/android.content.pm/fix_duplicated_flags_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "fix_duplicated_flags"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.pm/fix_system_apps_first_install_time_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/fix_system_apps_first_install_time_flag_values.textproto
deleted file mode 100644
index 82cd495e..00000000
--- a/aconfig/trunk_staging/android.content.pm/fix_system_apps_first_install_time_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "fix_system_apps_first_install_time"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.pm/force_multi_arch_native_libs_match_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/force_multi_arch_native_libs_match_flag_values.textproto
deleted file mode 100644
index 455fdda2..00000000
--- a/aconfig/trunk_staging/android.content.pm/force_multi_arch_native_libs_match_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "force_multi_arch_native_libs_match"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.pm/get_package_info_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/get_package_info_flag_values.textproto
deleted file mode 100644
index b60aa63e..00000000
--- a/aconfig/trunk_staging/android.content.pm/get_package_info_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "get_package_info"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.pm/get_package_info_with_fd_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/get_package_info_with_fd_flag_values.textproto
deleted file mode 100644
index 1655ed10..00000000
--- a/aconfig/trunk_staging/android.content.pm/get_package_info_with_fd_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "get_package_info_with_fd"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.pm/get_package_storage_stats_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/get_package_storage_stats_flag_values.textproto
deleted file mode 100644
index 558ef85a..00000000
--- a/aconfig/trunk_staging/android.content.pm/get_package_storage_stats_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "get_package_storage_stats"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.pm/get_resolved_apk_path_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/get_resolved_apk_path_flag_values.textproto
deleted file mode 100644
index 98b025aa..00000000
--- a/aconfig/trunk_staging/android.content.pm/get_resolved_apk_path_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "get_resolved_apk_path"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.pm/improve_home_app_behavior_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/improve_home_app_behavior_flag_values.textproto
deleted file mode 100644
index 7c0e86b3..00000000
--- a/aconfig/trunk_staging/android.content.pm/improve_home_app_behavior_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "improve_home_app_behavior"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.pm/improve_install_dont_kill_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/improve_install_dont_kill_flag_values.textproto
deleted file mode 100644
index abb1858f..00000000
--- a/aconfig/trunk_staging/android.content.pm/improve_install_dont_kill_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "improve_install_dont_kill"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.pm/improve_install_freeze_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/improve_install_freeze_flag_values.textproto
deleted file mode 100644
index 7d6f6187..00000000
--- a/aconfig/trunk_staging/android.content.pm/improve_install_freeze_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "improve_install_freeze"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.pm/include_feature_flags_in_package_cacher_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/include_feature_flags_in_package_cacher_flag_values.textproto
deleted file mode 100644
index 3f83c4b8..00000000
--- a/aconfig/trunk_staging/android.content.pm/include_feature_flags_in_package_cacher_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "include_feature_flags_in_package_cacher"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.pm/introduce_media_processing_type_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/introduce_media_processing_type_flag_values.textproto
deleted file mode 100644
index 696258bc..00000000
--- a/aconfig/trunk_staging/android.content.pm/introduce_media_processing_type_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "introduce_media_processing_type"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.pm/lightweight_invisible_label_detection_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/lightweight_invisible_label_detection_flag_values.textproto
deleted file mode 100644
index c4c34224..00000000
--- a/aconfig/trunk_staging/android.content.pm/lightweight_invisible_label_detection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "lightweight_invisible_label_detection"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.pm/min_target_sdk_24_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/min_target_sdk_24_flag_values.textproto
deleted file mode 100644
index 48693393..00000000
--- a/aconfig/trunk_staging/android.content.pm/min_target_sdk_24_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "min_target_sdk_24"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.pm/nullable_data_dir_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/nullable_data_dir_flag_values.textproto
deleted file mode 100644
index 0e34c99e..00000000
--- a/aconfig/trunk_staging/android.content.pm/nullable_data_dir_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "nullable_data_dir"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.pm/optimize_parsing_in_registered_services_cache_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/optimize_parsing_in_registered_services_cache_flag_values.textproto
deleted file mode 100644
index 4cbeef8e..00000000
--- a/aconfig/trunk_staging/android.content.pm/optimize_parsing_in_registered_services_cache_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "optimize_parsing_in_registered_services_cache"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.pm/package_restart_query_disabled_by_default_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/package_restart_query_disabled_by_default_flag_values.textproto
deleted file mode 100644
index 3f2dc38a..00000000
--- a/aconfig/trunk_staging/android.content.pm/package_restart_query_disabled_by_default_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "package_restart_query_disabled_by_default"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.pm/provide_info_of_apk_in_apex_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/provide_info_of_apk_in_apex_flag_values.textproto
deleted file mode 100644
index 830337cf..00000000
--- a/aconfig/trunk_staging/android.content.pm/provide_info_of_apk_in_apex_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "provide_info_of_apk_in_apex"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.pm/read_install_info_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/read_install_info_flag_values.textproto
deleted file mode 100644
index c6c821d9..00000000
--- a/aconfig/trunk_staging/android.content.pm/read_install_info_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "read_install_info"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.pm/recoverability_detection_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/recoverability_detection_flag_values.textproto
deleted file mode 100644
index 47b7aba6..00000000
--- a/aconfig/trunk_staging/android.content.pm/recoverability_detection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "recoverability_detection"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.pm/reduce_broadcasts_for_component_state_changes_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/reduce_broadcasts_for_component_state_changes_flag_values.textproto
deleted file mode 100644
index a4b3c183..00000000
--- a/aconfig/trunk_staging/android.content.pm/reduce_broadcasts_for_component_state_changes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "reduce_broadcasts_for_component_state_changes"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.pm/relative_reference_intent_filters_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/relative_reference_intent_filters_flag_values.textproto
deleted file mode 100644
index 4433a8ab..00000000
--- a/aconfig/trunk_staging/android.content.pm/relative_reference_intent_filters_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "relative_reference_intent_filters"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.pm/remove_cross_user_permission_hack_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/remove_cross_user_permission_hack_flag_values.textproto
deleted file mode 100644
index 667808be..00000000
--- a/aconfig/trunk_staging/android.content.pm/remove_cross_user_permission_hack_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "remove_cross_user_permission_hack"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.pm/remove_hidden_module_usage_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/remove_hidden_module_usage_flag_values.textproto
deleted file mode 100644
index 3564524e..00000000
--- a/aconfig/trunk_staging/android.content.pm/remove_hidden_module_usage_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "remove_hidden_module_usage"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.pm/restrict_nonpreloads_system_shareduids_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/restrict_nonpreloads_system_shareduids_flag_values.textproto
deleted file mode 100644
index 0f1a0810..00000000
--- a/aconfig/trunk_staging/android.content.pm/restrict_nonpreloads_system_shareduids_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "restrict_nonpreloads_system_shareduids"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.pm/rollback_lifetime_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/rollback_lifetime_flag_values.textproto
deleted file mode 100644
index a39d8180..00000000
--- a/aconfig/trunk_staging/android.content.pm/rollback_lifetime_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "rollback_lifetime"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.pm/sdk_dependency_installer_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/sdk_dependency_installer_flag_values.textproto
deleted file mode 100644
index d22b2a9a..00000000
--- a/aconfig/trunk_staging/android.content.pm/sdk_dependency_installer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "sdk_dependency_installer"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.pm/set_pre_verified_domains_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/set_pre_verified_domains_flag_values.textproto
deleted file mode 100644
index 677f918c..00000000
--- a/aconfig/trunk_staging/android.content.pm/set_pre_verified_domains_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "set_pre_verified_domains"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.pm/stay_stopped_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/stay_stopped_flag_values.textproto
deleted file mode 100644
index c8b3f5bf..00000000
--- a/aconfig/trunk_staging/android.content.pm/stay_stopped_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "stay_stopped"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.pm/support_minor_versions_in_minsdkversion_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/support_minor_versions_in_minsdkversion_flag_values.textproto
deleted file mode 100644
index 46e05473..00000000
--- a/aconfig/trunk_staging/android.content.pm/support_minor_versions_in_minsdkversion_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "support_minor_versions_in_minsdkversion"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.pm/uid_based_provider_lookup_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/uid_based_provider_lookup_flag_values.textproto
deleted file mode 100644
index 52e60929..00000000
--- a/aconfig/trunk_staging/android.content.pm/uid_based_provider_lookup_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "uid_based_provider_lookup"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.pm/use_art_service_v2_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/use_art_service_v2_flag_values.textproto
deleted file mode 100644
index 273e349b..00000000
--- a/aconfig/trunk_staging/android.content.pm/use_art_service_v2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "use_art_service_v2"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.pm/wait_application_killed_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/wait_application_killed_flag_values.textproto
deleted file mode 100644
index 9b75b6e6..00000000
--- a/aconfig/trunk_staging/android.content.pm/wait_application_killed_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.pm"
-  name: "wait_application_killed"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.res/Android.bp b/aconfig/trunk_staging/android.content.res/Android.bp
deleted file mode 100644
index fa771c10..00000000
--- a/aconfig/trunk_staging/android.content.res/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.content.res-all",
-    package: "android.content.res",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.content.res/asset_file_descriptor_frro_flag_values.textproto b/aconfig/trunk_staging/android.content.res/asset_file_descriptor_frro_flag_values.textproto
deleted file mode 100644
index 4134d304..00000000
--- a/aconfig/trunk_staging/android.content.res/asset_file_descriptor_frro_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.res"
-  name: "asset_file_descriptor_frro"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.res/default_locale_flag_values.textproto b/aconfig/trunk_staging/android.content.res/default_locale_flag_values.textproto
deleted file mode 100644
index b094c314..00000000
--- a/aconfig/trunk_staging/android.content.res/default_locale_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.res"
-  name: "default_locale"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.res/dimension_frro_flag_values.textproto b/aconfig/trunk_staging/android.content.res/dimension_frro_flag_values.textproto
deleted file mode 100644
index 9aa36bc1..00000000
--- a/aconfig/trunk_staging/android.content.res/dimension_frro_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.res"
-  name: "dimension_frro"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.res/font_scale_converter_public_flag_values.textproto b/aconfig/trunk_staging/android.content.res/font_scale_converter_public_flag_values.textproto
deleted file mode 100644
index cce20659..00000000
--- a/aconfig/trunk_staging/android.content.res/font_scale_converter_public_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.res"
-  name: "font_scale_converter_public"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.res/handle_all_config_changes_flag_values.textproto b/aconfig/trunk_staging/android.content.res/handle_all_config_changes_flag_values.textproto
deleted file mode 100644
index 1ad57c6c..00000000
--- a/aconfig/trunk_staging/android.content.res/handle_all_config_changes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.res"
-  name: "handle_all_config_changes"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.res/layout_readwrite_flags_flag_values.textproto b/aconfig/trunk_staging/android.content.res/layout_readwrite_flags_flag_values.textproto
deleted file mode 100644
index 7957c042..00000000
--- a/aconfig/trunk_staging/android.content.res/layout_readwrite_flags_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.res"
-  name: "layout_readwrite_flags"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.res/manifest_flagging_flag_values.textproto b/aconfig/trunk_staging/android.content.res/manifest_flagging_flag_values.textproto
deleted file mode 100644
index 0c6cef27..00000000
--- a/aconfig/trunk_staging/android.content.res/manifest_flagging_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.res"
-  name: "manifest_flagging"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.res/nine_patch_frro_flag_values.textproto b/aconfig/trunk_staging/android.content.res/nine_patch_frro_flag_values.textproto
deleted file mode 100644
index f3db90eb..00000000
--- a/aconfig/trunk_staging/android.content.res/nine_patch_frro_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.res"
-  name: "nine_patch_frro"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.res/register_resource_paths_flag_values.textproto b/aconfig/trunk_staging/android.content.res/register_resource_paths_flag_values.textproto
deleted file mode 100644
index 1a57d180..00000000
--- a/aconfig/trunk_staging/android.content.res/register_resource_paths_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.res"
-  name: "register_resource_paths"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.res/resources_minor_version_support_flag_values.textproto b/aconfig/trunk_staging/android.content.res/resources_minor_version_support_flag_values.textproto
deleted file mode 100644
index 6c8d6d6e..00000000
--- a/aconfig/trunk_staging/android.content.res/resources_minor_version_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.res"
-  name: "resources_minor_version_support"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.res/rro_constraints_flag_values.textproto b/aconfig/trunk_staging/android.content.res/rro_constraints_flag_values.textproto
deleted file mode 100644
index 3ea3b6fb..00000000
--- a/aconfig/trunk_staging/android.content.res/rro_constraints_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.res"
-  name: "rro_constraints"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.res/self_targeting_android_resource_frro_flag_values.textproto b/aconfig/trunk_staging/android.content.res/self_targeting_android_resource_frro_flag_values.textproto
deleted file mode 100644
index dcccd7ac..00000000
--- a/aconfig/trunk_staging/android.content.res/self_targeting_android_resource_frro_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.res"
-  name: "self_targeting_android_resource_frro"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.res/system_context_handle_app_info_changed_flag_values.textproto b/aconfig/trunk_staging/android.content.res/system_context_handle_app_info_changed_flag_values.textproto
deleted file mode 100644
index 185a5496..00000000
--- a/aconfig/trunk_staging/android.content.res/system_context_handle_app_info_changed_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.res"
-  name: "system_context_handle_app_info_changed"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.content.res/use_new_aconfig_storage_flag_values.textproto b/aconfig/trunk_staging/android.content.res/use_new_aconfig_storage_flag_values.textproto
deleted file mode 100644
index 0af7e3ff..00000000
--- a/aconfig/trunk_staging/android.content.res/use_new_aconfig_storage_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.content.res"
-  name: "use_new_aconfig_storage"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.crashrecovery.flags/Android.bp b/aconfig/trunk_staging/android.crashrecovery.flags/Android.bp
deleted file mode 100644
index 314e9115..00000000
--- a/aconfig/trunk_staging/android.crashrecovery.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.crashrecovery.flags-all",
-    package: "android.crashrecovery.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.crashrecovery.flags/deprecate_flags_and_settings_resets_flag_values.textproto b/aconfig/trunk_staging/android.crashrecovery.flags/deprecate_flags_and_settings_resets_flag_values.textproto
deleted file mode 100644
index f0b4e258..00000000
--- a/aconfig/trunk_staging/android.crashrecovery.flags/deprecate_flags_and_settings_resets_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.crashrecovery.flags"
-  name: "deprecate_flags_and_settings_resets"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.crashrecovery.flags/enable_crashrecovery_flag_values.textproto b/aconfig/trunk_staging/android.crashrecovery.flags/enable_crashrecovery_flag_values.textproto
deleted file mode 100644
index 51c898ce..00000000
--- a/aconfig/trunk_staging/android.crashrecovery.flags/enable_crashrecovery_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.crashrecovery.flags"
-  name: "enable_crashrecovery"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.crashrecovery.flags/recoverability_detection_flag_values.textproto b/aconfig/trunk_staging/android.crashrecovery.flags/recoverability_detection_flag_values.textproto
deleted file mode 100644
index 61ab4d52..00000000
--- a/aconfig/trunk_staging/android.crashrecovery.flags/recoverability_detection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.crashrecovery.flags"
-  name: "recoverability_detection"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.crashrecovery.flags/refactor_crashrecovery_flag_values.textproto b/aconfig/trunk_staging/android.crashrecovery.flags/refactor_crashrecovery_flag_values.textproto
deleted file mode 100644
index 5855e400..00000000
--- a/aconfig/trunk_staging/android.crashrecovery.flags/refactor_crashrecovery_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.crashrecovery.flags"
-  name: "refactor_crashrecovery"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.credentials.flags/Android.bp b/aconfig/trunk_staging/android.credentials.flags/Android.bp
deleted file mode 100644
index 12ddfd98..00000000
--- a/aconfig/trunk_staging/android.credentials.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.credentials.flags-all",
-    package: "android.credentials.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.credentials.flags/clear_credentials_fix_enabled_flag_values.textproto b/aconfig/trunk_staging/android.credentials.flags/clear_credentials_fix_enabled_flag_values.textproto
deleted file mode 100644
index d6102cb7..00000000
--- a/aconfig/trunk_staging/android.credentials.flags/clear_credentials_fix_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.credentials.flags"
-  name: "clear_credentials_fix_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.credentials.flags/clear_session_enabled_flag_values.textproto b/aconfig/trunk_staging/android.credentials.flags/clear_session_enabled_flag_values.textproto
deleted file mode 100644
index e1602fb4..00000000
--- a/aconfig/trunk_staging/android.credentials.flags/clear_session_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.credentials.flags"
-  name: "clear_session_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.credentials.flags/configurable_selector_ui_enabled_flag_values.textproto b/aconfig/trunk_staging/android.credentials.flags/configurable_selector_ui_enabled_flag_values.textproto
deleted file mode 100644
index dc280596..00000000
--- a/aconfig/trunk_staging/android.credentials.flags/configurable_selector_ui_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.credentials.flags"
-  name: "configurable_selector_ui_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.credentials.flags/credman_biometric_api_enabled_flag_values.textproto b/aconfig/trunk_staging/android.credentials.flags/credman_biometric_api_enabled_flag_values.textproto
deleted file mode 100644
index 0ad23587..00000000
--- a/aconfig/trunk_staging/android.credentials.flags/credman_biometric_api_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.credentials.flags"
-  name: "credman_biometric_api_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.credentials.flags/fix_metric_duplication_emits_flag_values.textproto b/aconfig/trunk_staging/android.credentials.flags/fix_metric_duplication_emits_flag_values.textproto
deleted file mode 100644
index fee6257f..00000000
--- a/aconfig/trunk_staging/android.credentials.flags/fix_metric_duplication_emits_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.credentials.flags"
-  name: "fix_metric_duplication_emits"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.credentials.flags/framework_session_id_metric_bundle_flag_values.textproto b/aconfig/trunk_staging/android.credentials.flags/framework_session_id_metric_bundle_flag_values.textproto
deleted file mode 100644
index adf469d6..00000000
--- a/aconfig/trunk_staging/android.credentials.flags/framework_session_id_metric_bundle_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.credentials.flags"
-  name: "framework_session_id_metric_bundle"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.credentials.flags/hybrid_filter_opt_fix_enabled_flag_values.textproto b/aconfig/trunk_staging/android.credentials.flags/hybrid_filter_opt_fix_enabled_flag_values.textproto
deleted file mode 100644
index 9fb63ce9..00000000
--- a/aconfig/trunk_staging/android.credentials.flags/hybrid_filter_opt_fix_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.credentials.flags"
-  name: "hybrid_filter_opt_fix_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.credentials.flags/instant_apps_enabled_flag_values.textproto b/aconfig/trunk_staging/android.credentials.flags/instant_apps_enabled_flag_values.textproto
deleted file mode 100644
index cd5379ab..00000000
--- a/aconfig/trunk_staging/android.credentials.flags/instant_apps_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.credentials.flags"
-  name: "instant_apps_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.credentials.flags/new_settings_intents_flag_values.textproto b/aconfig/trunk_staging/android.credentials.flags/new_settings_intents_flag_values.textproto
deleted file mode 100644
index e8f22cb9..00000000
--- a/aconfig/trunk_staging/android.credentials.flags/new_settings_intents_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.credentials.flags"
-  name: "new_settings_intents"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.credentials.flags/new_settings_ui_flag_values.textproto b/aconfig/trunk_staging/android.credentials.flags/new_settings_ui_flag_values.textproto
deleted file mode 100644
index d51db498..00000000
--- a/aconfig/trunk_staging/android.credentials.flags/new_settings_ui_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.credentials.flags"
-  name: "new_settings_ui"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.credentials.flags/package_update_fix_enabled_flag_values.textproto b/aconfig/trunk_staging/android.credentials.flags/package_update_fix_enabled_flag_values.textproto
deleted file mode 100644
index ee0ee26f..00000000
--- a/aconfig/trunk_staging/android.credentials.flags/package_update_fix_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.credentials.flags"
-  name: "package_update_fix_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.credentials.flags/propagate_user_context_for_intent_creation_flag_values.textproto b/aconfig/trunk_staging/android.credentials.flags/propagate_user_context_for_intent_creation_flag_values.textproto
deleted file mode 100644
index 2a796083..00000000
--- a/aconfig/trunk_staging/android.credentials.flags/propagate_user_context_for_intent_creation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.credentials.flags"
-  name: "propagate_user_context_for_intent_creation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.credentials.flags/safeguard_candidate_credentials_api_caller_flag_values.textproto b/aconfig/trunk_staging/android.credentials.flags/safeguard_candidate_credentials_api_caller_flag_values.textproto
deleted file mode 100644
index 08c31495..00000000
--- a/aconfig/trunk_staging/android.credentials.flags/safeguard_candidate_credentials_api_caller_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.credentials.flags"
-  name: "safeguard_candidate_credentials_api_caller"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.credentials.flags/selector_ui_improvements_enabled_flag_values.textproto b/aconfig/trunk_staging/android.credentials.flags/selector_ui_improvements_enabled_flag_values.textproto
deleted file mode 100644
index 69731a4f..00000000
--- a/aconfig/trunk_staging/android.credentials.flags/selector_ui_improvements_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.credentials.flags"
-  name: "selector_ui_improvements_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.credentials.flags/settings_activity_enabled_flag_values.textproto b/aconfig/trunk_staging/android.credentials.flags/settings_activity_enabled_flag_values.textproto
deleted file mode 100644
index 788b59b2..00000000
--- a/aconfig/trunk_staging/android.credentials.flags/settings_activity_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.credentials.flags"
-  name: "settings_activity_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.database.sqlite/Android.bp b/aconfig/trunk_staging/android.database.sqlite/Android.bp
deleted file mode 100644
index 9a6dcce7..00000000
--- a/aconfig/trunk_staging/android.database.sqlite/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.database.sqlite-all",
-    package: "android.database.sqlite",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.database.sqlite/concurrent_open_helper_flag_values.textproto b/aconfig/trunk_staging/android.database.sqlite/concurrent_open_helper_flag_values.textproto
deleted file mode 100644
index bc663883..00000000
--- a/aconfig/trunk_staging/android.database.sqlite/concurrent_open_helper_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.database.sqlite"
-  name: "concurrent_open_helper"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.database.sqlite/no_checkpoint_on_finalize_flag_values.textproto b/aconfig/trunk_staging/android.database.sqlite/no_checkpoint_on_finalize_flag_values.textproto
deleted file mode 100644
index b7aa3c5f..00000000
--- a/aconfig/trunk_staging/android.database.sqlite/no_checkpoint_on_finalize_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.database.sqlite"
-  name: "no_checkpoint_on_finalize"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.database.sqlite/oneway_finalizer_close_fixed_flag_values.textproto b/aconfig/trunk_staging/android.database.sqlite/oneway_finalizer_close_fixed_flag_values.textproto
deleted file mode 100644
index 99d8be8a..00000000
--- a/aconfig/trunk_staging/android.database.sqlite/oneway_finalizer_close_fixed_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.database.sqlite"
-  name: "oneway_finalizer_close_fixed"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.database.sqlite/simple_sql_comment_scanner_flag_values.textproto b/aconfig/trunk_staging/android.database.sqlite/simple_sql_comment_scanner_flag_values.textproto
deleted file mode 100644
index ed58259f..00000000
--- a/aconfig/trunk_staging/android.database.sqlite/simple_sql_comment_scanner_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.database.sqlite"
-  name: "simple_sql_comment_scanner"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.database.sqlite/sqlite_allow_temp_tables_flag_values.textproto b/aconfig/trunk_staging/android.database.sqlite/sqlite_allow_temp_tables_flag_values.textproto
deleted file mode 100644
index fdb5a89e..00000000
--- a/aconfig/trunk_staging/android.database.sqlite/sqlite_allow_temp_tables_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.database.sqlite"
-  name: "sqlite_allow_temp_tables"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.database.sqlite/sqlite_apis_35_flag_values.textproto b/aconfig/trunk_staging/android.database.sqlite/sqlite_apis_35_flag_values.textproto
deleted file mode 100644
index c5c3c952..00000000
--- a/aconfig/trunk_staging/android.database.sqlite/sqlite_apis_35_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.database.sqlite"
-  name: "sqlite_apis_35"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.graphics.pdf.flags.readonly/Android.bp b/aconfig/trunk_staging/android.graphics.pdf.flags.readonly/Android.bp
deleted file mode 100644
index eca7c426..00000000
--- a/aconfig/trunk_staging/android.graphics.pdf.flags.readonly/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.graphics.pdf.flags.readonly-all",
-    package: "android.graphics.pdf.flags.readonly",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.graphics.pdf.flags.readonly/enable_edit_pdf_stamp_annotations_flag_values.textproto b/aconfig/trunk_staging/android.graphics.pdf.flags.readonly/enable_edit_pdf_stamp_annotations_flag_values.textproto
deleted file mode 100644
index bb249d37..00000000
--- a/aconfig/trunk_staging/android.graphics.pdf.flags.readonly/enable_edit_pdf_stamp_annotations_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.graphics.pdf.flags.readonly"
-  name: "enable_edit_pdf_stamp_annotations"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.graphics.pdf.flags.readonly/enable_edit_pdf_text_annotations_flag_values.textproto b/aconfig/trunk_staging/android.graphics.pdf.flags.readonly/enable_edit_pdf_text_annotations_flag_values.textproto
deleted file mode 100644
index ededbdc0..00000000
--- a/aconfig/trunk_staging/android.graphics.pdf.flags.readonly/enable_edit_pdf_text_annotations_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.graphics.pdf.flags.readonly"
-  name: "enable_edit_pdf_text_annotations"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.graphics.pdf.flags/Android.bp b/aconfig/trunk_staging/android.graphics.pdf.flags/Android.bp
deleted file mode 100644
index 049b9dbd..00000000
--- a/aconfig/trunk_staging/android.graphics.pdf.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.graphics.pdf.flags-all",
-    package: "android.graphics.pdf.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.graphics.pdf.flags/enable_edit_pdf_annotations_flag_values.textproto b/aconfig/trunk_staging/android.graphics.pdf.flags/enable_edit_pdf_annotations_flag_values.textproto
deleted file mode 100644
index fe839065..00000000
--- a/aconfig/trunk_staging/android.graphics.pdf.flags/enable_edit_pdf_annotations_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.graphics.pdf.flags"
-  name: "enable_edit_pdf_annotations"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.graphics.pdf.flags/enable_edit_pdf_page_objects_flag_values.textproto b/aconfig/trunk_staging/android.graphics.pdf.flags/enable_edit_pdf_page_objects_flag_values.textproto
deleted file mode 100644
index b1e23f91..00000000
--- a/aconfig/trunk_staging/android.graphics.pdf.flags/enable_edit_pdf_page_objects_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.graphics.pdf.flags"
-  name: "enable_edit_pdf_page_objects"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.graphics.pdf.flags/enable_edit_pdf_stamp_annotations_flag_values.textproto b/aconfig/trunk_staging/android.graphics.pdf.flags/enable_edit_pdf_stamp_annotations_flag_values.textproto
deleted file mode 100644
index 78f56d6c..00000000
--- a/aconfig/trunk_staging/android.graphics.pdf.flags/enable_edit_pdf_stamp_annotations_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.graphics.pdf.flags"
-  name: "enable_edit_pdf_stamp_annotations"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.graphics.pdf.flags/enable_edit_pdf_text_annotations_flag_values.textproto b/aconfig/trunk_staging/android.graphics.pdf.flags/enable_edit_pdf_text_annotations_flag_values.textproto
deleted file mode 100644
index dd677d35..00000000
--- a/aconfig/trunk_staging/android.graphics.pdf.flags/enable_edit_pdf_text_annotations_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.graphics.pdf.flags"
-  name: "enable_edit_pdf_text_annotations"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.graphics.pdf.flags/enable_edit_pdf_text_objects_flag_values.textproto b/aconfig/trunk_staging/android.graphics.pdf.flags/enable_edit_pdf_text_objects_flag_values.textproto
deleted file mode 100644
index 34e5da01..00000000
--- a/aconfig/trunk_staging/android.graphics.pdf.flags/enable_edit_pdf_text_objects_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.graphics.pdf.flags"
-  name: "enable_edit_pdf_text_objects"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.graphics.pdf.flags/enable_form_filling_flag_values.textproto b/aconfig/trunk_staging/android.graphics.pdf.flags/enable_form_filling_flag_values.textproto
deleted file mode 100644
index bede6482..00000000
--- a/aconfig/trunk_staging/android.graphics.pdf.flags/enable_form_filling_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.graphics.pdf.flags"
-  name: "enable_form_filling"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.graphics.pdf.flags/enable_pdf_viewer_flag_values.textproto b/aconfig/trunk_staging/android.graphics.pdf.flags/enable_pdf_viewer_flag_values.textproto
deleted file mode 100644
index c9e3d51e..00000000
--- a/aconfig/trunk_staging/android.graphics.pdf.flags/enable_pdf_viewer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.graphics.pdf.flags"
-  name: "enable_pdf_viewer"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.hardware.biometrics/Android.bp b/aconfig/trunk_staging/android.hardware.biometrics/Android.bp
deleted file mode 100644
index ee27cffd..00000000
--- a/aconfig/trunk_staging/android.hardware.biometrics/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.hardware.biometrics-all",
-    package: "android.hardware.biometrics",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.hardware.biometrics/add_key_agreement_crypto_object_flag_values.textproto b/aconfig/trunk_staging/android.hardware.biometrics/add_key_agreement_crypto_object_flag_values.textproto
deleted file mode 100644
index bf7ab5ba..00000000
--- a/aconfig/trunk_staging/android.hardware.biometrics/add_key_agreement_crypto_object_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.biometrics"
-  name: "add_key_agreement_crypto_object"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.hardware.biometrics/custom_biometric_prompt_flag_values.textproto b/aconfig/trunk_staging/android.hardware.biometrics/custom_biometric_prompt_flag_values.textproto
deleted file mode 100644
index e44b0cd2..00000000
--- a/aconfig/trunk_staging/android.hardware.biometrics/custom_biometric_prompt_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.biometrics"
-  name: "custom_biometric_prompt"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.hardware.biometrics/get_op_id_crypto_object_flag_values.textproto b/aconfig/trunk_staging/android.hardware.biometrics/get_op_id_crypto_object_flag_values.textproto
deleted file mode 100644
index b092a0f7..00000000
--- a/aconfig/trunk_staging/android.hardware.biometrics/get_op_id_crypto_object_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.biometrics"
-  name: "get_op_id_crypto_object"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.hardware.biometrics/identity_check_api_flag_values.textproto b/aconfig/trunk_staging/android.hardware.biometrics/identity_check_api_flag_values.textproto
deleted file mode 100644
index 1b063aed..00000000
--- a/aconfig/trunk_staging/android.hardware.biometrics/identity_check_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.biometrics"
-  name: "identity_check_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.hardware.biometrics/last_authentication_time_flag_values.textproto b/aconfig/trunk_staging/android.hardware.biometrics/last_authentication_time_flag_values.textproto
deleted file mode 100644
index 8a672935..00000000
--- a/aconfig/trunk_staging/android.hardware.biometrics/last_authentication_time_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.biometrics"
-  name: "last_authentication_time"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.hardware.biometrics/mandatory_biometrics_flag_values.textproto b/aconfig/trunk_staging/android.hardware.biometrics/mandatory_biometrics_flag_values.textproto
deleted file mode 100644
index aa78c4a9..00000000
--- a/aconfig/trunk_staging/android.hardware.biometrics/mandatory_biometrics_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.biometrics"
-  name: "mandatory_biometrics"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.hardware.biometrics/private_space_bp_flag_values.textproto b/aconfig/trunk_staging/android.hardware.biometrics/private_space_bp_flag_values.textproto
deleted file mode 100644
index 6ba0798e..00000000
--- a/aconfig/trunk_staging/android.hardware.biometrics/private_space_bp_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.biometrics"
-  name: "private_space_bp"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.hardware.biometrics/screen_off_unlock_udfps_flag_values.textproto b/aconfig/trunk_staging/android.hardware.biometrics/screen_off_unlock_udfps_flag_values.textproto
deleted file mode 100644
index de8bc4b7..00000000
--- a/aconfig/trunk_staging/android.hardware.biometrics/screen_off_unlock_udfps_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.biometrics"
-  name: "screen_off_unlock_udfps"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.hardware.devicestate.feature.flags/Android.bp b/aconfig/trunk_staging/android.hardware.devicestate.feature.flags/Android.bp
deleted file mode 100644
index 94efdc22..00000000
--- a/aconfig/trunk_staging/android.hardware.devicestate.feature.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.hardware.devicestate.feature.flags-all",
-    package: "android.hardware.devicestate.feature.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.hardware.devicestate.feature.flags/device_state_configuration_flag_flag_values.textproto b/aconfig/trunk_staging/android.hardware.devicestate.feature.flags/device_state_configuration_flag_flag_values.textproto
deleted file mode 100644
index ec5dd9db..00000000
--- a/aconfig/trunk_staging/android.hardware.devicestate.feature.flags/device_state_configuration_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.devicestate.feature.flags"
-  name: "device_state_configuration_flag"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.hardware.devicestate.feature.flags/device_state_property_api_flag_values.textproto b/aconfig/trunk_staging/android.hardware.devicestate.feature.flags/device_state_property_api_flag_values.textproto
deleted file mode 100644
index 46b1bbed..00000000
--- a/aconfig/trunk_staging/android.hardware.devicestate.feature.flags/device_state_property_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.devicestate.feature.flags"
-  name: "device_state_property_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.hardware.devicestate.feature.flags/device_state_property_migration_flag_values.textproto b/aconfig/trunk_staging/android.hardware.devicestate.feature.flags/device_state_property_migration_flag_values.textproto
deleted file mode 100644
index a81e3231..00000000
--- a/aconfig/trunk_staging/android.hardware.devicestate.feature.flags/device_state_property_migration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.devicestate.feature.flags"
-  name: "device_state_property_migration"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.hardware.devicestate.feature.flags/device_state_rdm_v2_flag_values.textproto b/aconfig/trunk_staging/android.hardware.devicestate.feature.flags/device_state_rdm_v2_flag_values.textproto
deleted file mode 100644
index 9ea164d4..00000000
--- a/aconfig/trunk_staging/android.hardware.devicestate.feature.flags/device_state_rdm_v2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.devicestate.feature.flags"
-  name: "device_state_rdm_v2"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.hardware.devicestate.feature.flags/device_state_requester_cancel_state_flag_values.textproto b/aconfig/trunk_staging/android.hardware.devicestate.feature.flags/device_state_requester_cancel_state_flag_values.textproto
deleted file mode 100644
index 0bf8cc09..00000000
--- a/aconfig/trunk_staging/android.hardware.devicestate.feature.flags/device_state_requester_cancel_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.devicestate.feature.flags"
-  name: "device_state_requester_cancel_state"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.hardware.flags/Android.bp b/aconfig/trunk_staging/android.hardware.flags/Android.bp
deleted file mode 100644
index a4c0fb13..00000000
--- a/aconfig/trunk_staging/android.hardware.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.hardware.flags-all",
-    package: "android.hardware.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.hardware.flags/luts_api_flag_values.textproto b/aconfig/trunk_staging/android.hardware.flags/luts_api_flag_values.textproto
deleted file mode 100644
index ec52c99c..00000000
--- a/aconfig/trunk_staging/android.hardware.flags/luts_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.flags"
-  name: "luts_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.hardware.flags/overlayproperties_class_api_flag_values.textproto b/aconfig/trunk_staging/android.hardware.flags/overlayproperties_class_api_flag_values.textproto
deleted file mode 100644
index e9721191..00000000
--- a/aconfig/trunk_staging/android.hardware.flags/overlayproperties_class_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.flags"
-  name: "overlayproperties_class_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.hardware.radio/Android.bp b/aconfig/trunk_staging/android.hardware.radio/Android.bp
deleted file mode 100644
index 476976b1..00000000
--- a/aconfig/trunk_staging/android.hardware.radio/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.hardware.radio-all",
-    package: "android.hardware.radio",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.hardware.radio/hd_radio_emergency_alert_system_flag_values.textproto b/aconfig/trunk_staging/android.hardware.radio/hd_radio_emergency_alert_system_flag_values.textproto
deleted file mode 100644
index 77e3aa41..00000000
--- a/aconfig/trunk_staging/android.hardware.radio/hd_radio_emergency_alert_system_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.radio"
-  name: "hd_radio_emergency_alert_system"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.hardware.radio/hd_radio_improved_flag_values.textproto b/aconfig/trunk_staging/android.hardware.radio/hd_radio_improved_flag_values.textproto
deleted file mode 100644
index 97a3dc91..00000000
--- a/aconfig/trunk_staging/android.hardware.radio/hd_radio_improved_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.radio"
-  name: "hd_radio_improved"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.hardware.usb.flags/Android.bp b/aconfig/trunk_staging/android.hardware.usb.flags/Android.bp
deleted file mode 100644
index fa4b02f9..00000000
--- a/aconfig/trunk_staging/android.hardware.usb.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.hardware.usb.flags-all",
-    package: "android.hardware.usb.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.hardware.usb.flags/enable_accessory_stream_api_flag_values.textproto b/aconfig/trunk_staging/android.hardware.usb.flags/enable_accessory_stream_api_flag_values.textproto
deleted file mode 100644
index e61575aa..00000000
--- a/aconfig/trunk_staging/android.hardware.usb.flags/enable_accessory_stream_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.usb.flags"
-  name: "enable_accessory_stream_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.hardware.usb.flags/enable_input_power_limited_warning_flag_values.textproto b/aconfig/trunk_staging/android.hardware.usb.flags/enable_input_power_limited_warning_flag_values.textproto
deleted file mode 100644
index 415a5a88..00000000
--- a/aconfig/trunk_staging/android.hardware.usb.flags/enable_input_power_limited_warning_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.usb.flags"
-  name: "enable_input_power_limited_warning"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.hardware.usb.flags/enable_interface_name_device_filter_flag_values.textproto b/aconfig/trunk_staging/android.hardware.usb.flags/enable_interface_name_device_filter_flag_values.textproto
deleted file mode 100644
index b7d9f1bf..00000000
--- a/aconfig/trunk_staging/android.hardware.usb.flags/enable_interface_name_device_filter_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.usb.flags"
-  name: "enable_interface_name_device_filter"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.hardware.usb.flags/enable_is_mode_change_supported_api_flag_values.textproto b/aconfig/trunk_staging/android.hardware.usb.flags/enable_is_mode_change_supported_api_flag_values.textproto
deleted file mode 100644
index 74b39cf4..00000000
--- a/aconfig/trunk_staging/android.hardware.usb.flags/enable_is_mode_change_supported_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.usb.flags"
-  name: "enable_is_mode_change_supported_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.hardware.usb.flags/enable_is_pd_compliant_api_flag_values.textproto b/aconfig/trunk_staging/android.hardware.usb.flags/enable_is_pd_compliant_api_flag_values.textproto
deleted file mode 100644
index 8ea53f2f..00000000
--- a/aconfig/trunk_staging/android.hardware.usb.flags/enable_is_pd_compliant_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.usb.flags"
-  name: "enable_is_pd_compliant_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.hardware.usb.flags/enable_report_usb_data_compliance_warning_flag_values.textproto b/aconfig/trunk_staging/android.hardware.usb.flags/enable_report_usb_data_compliance_warning_flag_values.textproto
deleted file mode 100644
index 22f17420..00000000
--- a/aconfig/trunk_staging/android.hardware.usb.flags/enable_report_usb_data_compliance_warning_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.usb.flags"
-  name: "enable_report_usb_data_compliance_warning"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.hardware.usb.flags/enable_udc_sysfs_usb_state_update_flag_values.textproto b/aconfig/trunk_staging/android.hardware.usb.flags/enable_udc_sysfs_usb_state_update_flag_values.textproto
deleted file mode 100644
index 19444db8..00000000
--- a/aconfig/trunk_staging/android.hardware.usb.flags/enable_udc_sysfs_usb_state_update_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.usb.flags"
-  name: "enable_udc_sysfs_usb_state_update"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.hardware.usb.flags/enable_usb_data_compliance_warning_flag_values.textproto b/aconfig/trunk_staging/android.hardware.usb.flags/enable_usb_data_compliance_warning_flag_values.textproto
deleted file mode 100644
index 70470e8d..00000000
--- a/aconfig/trunk_staging/android.hardware.usb.flags/enable_usb_data_compliance_warning_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.usb.flags"
-  name: "enable_usb_data_compliance_warning"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.hardware.usb.flags/enable_usb_data_signal_staking_flag_values.textproto b/aconfig/trunk_staging/android.hardware.usb.flags/enable_usb_data_signal_staking_flag_values.textproto
deleted file mode 100644
index 633b5b9d..00000000
--- a/aconfig/trunk_staging/android.hardware.usb.flags/enable_usb_data_signal_staking_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.usb.flags"
-  name: "enable_usb_data_signal_staking"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.hardware.usb.flags/enable_usb_data_signal_staking_internal_flag_values.textproto b/aconfig/trunk_staging/android.hardware.usb.flags/enable_usb_data_signal_staking_internal_flag_values.textproto
deleted file mode 100644
index 15b1a6b3..00000000
--- a/aconfig/trunk_staging/android.hardware.usb.flags/enable_usb_data_signal_staking_internal_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.usb.flags"
-  name: "enable_usb_data_signal_staking_internal"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.hardware.usb.flags/enable_usb_sysfs_midi_identification_flag_values.textproto b/aconfig/trunk_staging/android.hardware.usb.flags/enable_usb_sysfs_midi_identification_flag_values.textproto
deleted file mode 100644
index 7c917c80..00000000
--- a/aconfig/trunk_staging/android.hardware.usb.flags/enable_usb_sysfs_midi_identification_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.usb.flags"
-  name: "enable_usb_sysfs_midi_identification"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.hardware.usb.flags/expose_usb_speed_system_api_flag_values.textproto b/aconfig/trunk_staging/android.hardware.usb.flags/expose_usb_speed_system_api_flag_values.textproto
deleted file mode 100644
index 3d7d9a6a..00000000
--- a/aconfig/trunk_staging/android.hardware.usb.flags/expose_usb_speed_system_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.hardware.usb.flags"
-  name: "expose_usb_speed_system_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.location.flags/Android.bp b/aconfig/trunk_staging/android.location.flags/Android.bp
deleted file mode 100644
index 4bd0b2ba..00000000
--- a/aconfig/trunk_staging/android.location.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.location.flags-all",
-    package: "android.location.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.location.flags/density_based_coarse_locations_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/density_based_coarse_locations_flag_values.textproto
deleted file mode 100644
index 132dc481..00000000
--- a/aconfig/trunk_staging/android.location.flags/density_based_coarse_locations_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "density_based_coarse_locations"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.location.flags/deprecate_provider_request_apis_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/deprecate_provider_request_apis_flag_values.textproto
deleted file mode 100644
index ae54f61c..00000000
--- a/aconfig/trunk_staging/android.location.flags/deprecate_provider_request_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "deprecate_provider_request_apis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.location.flags/disable_stationary_throttling_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/disable_stationary_throttling_flag_values.textproto
deleted file mode 100644
index 53ccaabe..00000000
--- a/aconfig/trunk_staging/android.location.flags/disable_stationary_throttling_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "disable_stationary_throttling"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.location.flags/enable_location_bypass_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/enable_location_bypass_flag_values.textproto
deleted file mode 100644
index d16bf759..00000000
--- a/aconfig/trunk_staging/android.location.flags/enable_location_bypass_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "enable_location_bypass"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.location.flags/enable_ni_supl_message_injection_by_carrier_config_bugfix_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/enable_ni_supl_message_injection_by_carrier_config_bugfix_flag_values.textproto
deleted file mode 100644
index d0fbae3f..00000000
--- a/aconfig/trunk_staging/android.location.flags/enable_ni_supl_message_injection_by_carrier_config_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "enable_ni_supl_message_injection_by_carrier_config_bugfix"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.location.flags/fix_is_in_emergency_anr_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/fix_is_in_emergency_anr_flag_values.textproto
deleted file mode 100644
index 3ad6ebc7..00000000
--- a/aconfig/trunk_staging/android.location.flags/fix_is_in_emergency_anr_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "fix_is_in_emergency_anr"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.location.flags/fix_service_watcher_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/fix_service_watcher_flag_values.textproto
deleted file mode 100644
index 28b8db9a..00000000
--- a/aconfig/trunk_staging/android.location.flags/fix_service_watcher_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "fix_service_watcher"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.location.flags/geoid_heights_via_altitude_hal_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/geoid_heights_via_altitude_hal_flag_values.textproto
deleted file mode 100644
index 84df1252..00000000
--- a/aconfig/trunk_staging/android.location.flags/geoid_heights_via_altitude_hal_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "geoid_heights_via_altitude_hal"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.location.flags/gnss_api_measurement_request_work_source_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/gnss_api_measurement_request_work_source_flag_values.textproto
deleted file mode 100644
index 132fd179..00000000
--- a/aconfig/trunk_staging/android.location.flags/gnss_api_measurement_request_work_source_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "gnss_api_measurement_request_work_source"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.location.flags/gnss_api_navic_l1_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/gnss_api_navic_l1_flag_values.textproto
deleted file mode 100644
index 468d40e9..00000000
--- a/aconfig/trunk_staging/android.location.flags/gnss_api_navic_l1_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "gnss_api_navic_l1"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.location.flags/gnss_assistance_interface_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/gnss_assistance_interface_flag_values.textproto
deleted file mode 100644
index 49875806..00000000
--- a/aconfig/trunk_staging/android.location.flags/gnss_assistance_interface_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "gnss_assistance_interface"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.location.flags/gnss_configuration_from_resource_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/gnss_configuration_from_resource_flag_values.textproto
deleted file mode 100644
index 5c57ce75..00000000
--- a/aconfig/trunk_staging/android.location.flags/gnss_configuration_from_resource_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "gnss_configuration_from_resource"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.location.flags/gnss_location_provider_overlay_2025_devices_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/gnss_location_provider_overlay_2025_devices_flag_values.textproto
deleted file mode 100644
index 0dd0dfd3..00000000
--- a/aconfig/trunk_staging/android.location.flags/gnss_location_provider_overlay_2025_devices_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "gnss_location_provider_overlay_2025_devices"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.location.flags/limit_fused_gps_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/limit_fused_gps_flag_values.textproto
deleted file mode 100644
index 8bb83bb4..00000000
--- a/aconfig/trunk_staging/android.location.flags/limit_fused_gps_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "limit_fused_gps"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.location.flags/location_bypass_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/location_bypass_flag_values.textproto
deleted file mode 100644
index 1e86f9b5..00000000
--- a/aconfig/trunk_staging/android.location.flags/location_bypass_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "location_bypass"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.location.flags/location_validation_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/location_validation_flag_values.textproto
deleted file mode 100644
index 6d923a6d..00000000
--- a/aconfig/trunk_staging/android.location.flags/location_validation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "location_validation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.location.flags/missing_attribution_tags_in_overlay_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/missing_attribution_tags_in_overlay_flag_values.textproto
deleted file mode 100644
index 4bea345a..00000000
--- a/aconfig/trunk_staging/android.location.flags/missing_attribution_tags_in_overlay_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "missing_attribution_tags_in_overlay"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.location.flags/new_geocoder_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/new_geocoder_flag_values.textproto
deleted file mode 100644
index 126ac098..00000000
--- a/aconfig/trunk_staging/android.location.flags/new_geocoder_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "new_geocoder"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.location.flags/population_density_provider_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/population_density_provider_flag_values.textproto
deleted file mode 100644
index 059a446e..00000000
--- a/aconfig/trunk_staging/android.location.flags/population_density_provider_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "population_density_provider"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.location.flags/release_supl_connection_on_timeout_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/release_supl_connection_on_timeout_flag_values.textproto
deleted file mode 100644
index d585922e..00000000
--- a/aconfig/trunk_staging/android.location.flags/release_supl_connection_on_timeout_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "release_supl_connection_on_timeout"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.location.flags/replace_future_elapsed_realtime_jni_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/replace_future_elapsed_realtime_jni_flag_values.textproto
deleted file mode 100644
index 1a723a07..00000000
--- a/aconfig/trunk_staging/android.location.flags/replace_future_elapsed_realtime_jni_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "replace_future_elapsed_realtime_jni"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.location.flags/service_watcher_unstable_fallback_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/service_watcher_unstable_fallback_flag_values.textproto
deleted file mode 100644
index 68250113..00000000
--- a/aconfig/trunk_staging/android.location.flags/service_watcher_unstable_fallback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "service_watcher_unstable_fallback"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.location.flags/subscriptions_changed_listener_thread_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/subscriptions_changed_listener_thread_flag_values.textproto
deleted file mode 100644
index 24f03004..00000000
--- a/aconfig/trunk_staging/android.location.flags/subscriptions_changed_listener_thread_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "subscriptions_changed_listener_thread"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.location.flags/update_min_location_request_interval_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/update_min_location_request_interval_flag_values.textproto
deleted file mode 100644
index faa525b6..00000000
--- a/aconfig/trunk_staging/android.location.flags/update_min_location_request_interval_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "update_min_location_request_interval"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.location.flags/use_legacy_ntp_time_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/use_legacy_ntp_time_flag_values.textproto
deleted file mode 100644
index 27dfbb9a..00000000
--- a/aconfig/trunk_staging/android.location.flags/use_legacy_ntp_time_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "use_legacy_ntp_time"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/Android.bp b/aconfig/trunk_staging/android.media.audio/Android.bp
deleted file mode 100644
index 51a84ed4..00000000
--- a/aconfig/trunk_staging/android.media.audio/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.media.audio-all",
-    package: "android.media.audio",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.media.audio/auto_public_volume_api_hardening_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/auto_public_volume_api_hardening_flag_values.textproto
deleted file mode 100644
index b065aba4..00000000
--- a/aconfig/trunk_staging/android.media.audio/auto_public_volume_api_hardening_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "auto_public_volume_api_hardening"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/automatic_bt_device_type_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/automatic_bt_device_type_flag_values.textproto
deleted file mode 100644
index 90347a59..00000000
--- a/aconfig/trunk_staging/android.media.audio/automatic_bt_device_type_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "automatic_bt_device_type"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/cache_get_stream_min_max_volume_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/cache_get_stream_min_max_volume_flag_values.textproto
deleted file mode 100644
index 3a1c0543..00000000
--- a/aconfig/trunk_staging/android.media.audio/cache_get_stream_min_max_volume_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "cache_get_stream_min_max_volume"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/cache_get_stream_volume_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/cache_get_stream_volume_flag_values.textproto
deleted file mode 100644
index 056c8b48..00000000
--- a/aconfig/trunk_staging/android.media.audio/cache_get_stream_volume_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "cache_get_stream_volume"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/concurrent_audio_record_bypass_permission_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/concurrent_audio_record_bypass_permission_flag_values.textproto
deleted file mode 100644
index 0aef2936..00000000
--- a/aconfig/trunk_staging/android.media.audio/concurrent_audio_record_bypass_permission_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "concurrent_audio_record_bypass_permission"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/deprecate_stream_bt_sco_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/deprecate_stream_bt_sco_flag_values.textproto
deleted file mode 100644
index 42632e10..00000000
--- a/aconfig/trunk_staging/android.media.audio/deprecate_stream_bt_sco_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "deprecate_stream_bt_sco"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/dolby_ac4_level4_encoding_api_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/dolby_ac4_level4_encoding_api_flag_values.textproto
deleted file mode 100644
index 24dfe660..00000000
--- a/aconfig/trunk_staging/android.media.audio/dolby_ac4_level4_encoding_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "dolby_ac4_level4_encoding_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.media.audio/enable_multichannel_group_device_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/enable_multichannel_group_device_flag_values.textproto
deleted file mode 100644
index e8eb7565..00000000
--- a/aconfig/trunk_staging/android.media.audio/enable_multichannel_group_device_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "enable_multichannel_group_device"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.media.audio/enable_ringtone_haptics_customization_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/enable_ringtone_haptics_customization_flag_values.textproto
deleted file mode 100644
index c9b2458b..00000000
--- a/aconfig/trunk_staging/android.media.audio/enable_ringtone_haptics_customization_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "enable_ringtone_haptics_customization"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/feature_spatial_audio_headtracking_low_latency_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/feature_spatial_audio_headtracking_low_latency_flag_values.textproto
deleted file mode 100644
index 053de58d..00000000
--- a/aconfig/trunk_staging/android.media.audio/feature_spatial_audio_headtracking_low_latency_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "feature_spatial_audio_headtracking_low_latency"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/focus_exclusive_with_recording_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/focus_exclusive_with_recording_flag_values.textproto
deleted file mode 100644
index f0a9dbb3..00000000
--- a/aconfig/trunk_staging/android.media.audio/focus_exclusive_with_recording_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "focus_exclusive_with_recording"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/focus_freeze_test_api_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/focus_freeze_test_api_flag_values.textproto
deleted file mode 100644
index d849099e..00000000
--- a/aconfig/trunk_staging/android.media.audio/focus_freeze_test_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "focus_freeze_test_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/hardening_permission_api_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/hardening_permission_api_flag_values.textproto
deleted file mode 100644
index 46ff6935..00000000
--- a/aconfig/trunk_staging/android.media.audio/hardening_permission_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "hardening_permission_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/hardening_permission_spa_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/hardening_permission_spa_flag_values.textproto
deleted file mode 100644
index 0e622514..00000000
--- a/aconfig/trunk_staging/android.media.audio/hardening_permission_spa_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "hardening_permission_spa"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/iamf_definitions_api_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/iamf_definitions_api_flag_values.textproto
deleted file mode 100644
index b8a4253c..00000000
--- a/aconfig/trunk_staging/android.media.audio/iamf_definitions_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "iamf_definitions_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/loudness_configurator_api_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/loudness_configurator_api_flag_values.textproto
deleted file mode 100644
index aed3e3dc..00000000
--- a/aconfig/trunk_staging/android.media.audio/loudness_configurator_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "loudness_configurator_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/mute_background_audio_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/mute_background_audio_flag_values.textproto
deleted file mode 100644
index e3f7616f..00000000
--- a/aconfig/trunk_staging/android.media.audio/mute_background_audio_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "mute_background_audio"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/muted_by_port_volume_api_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/muted_by_port_volume_api_flag_values.textproto
deleted file mode 100644
index 3672d829..00000000
--- a/aconfig/trunk_staging/android.media.audio/muted_by_port_volume_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "muted_by_port_volume_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/ringtone_user_uri_check_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/ringtone_user_uri_check_flag_values.textproto
deleted file mode 100644
index c99d5141..00000000
--- a/aconfig/trunk_staging/android.media.audio/ringtone_user_uri_check_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "ringtone_user_uri_check"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/ro_foreground_audio_control_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/ro_foreground_audio_control_flag_values.textproto
deleted file mode 100644
index 0cbe1242..00000000
--- a/aconfig/trunk_staging/android.media.audio/ro_foreground_audio_control_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "ro_foreground_audio_control"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.media.audio/ro_volume_ringer_api_hardening_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/ro_volume_ringer_api_hardening_flag_values.textproto
deleted file mode 100644
index f63a378b..00000000
--- a/aconfig/trunk_staging/android.media.audio/ro_volume_ringer_api_hardening_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "ro_volume_ringer_api_hardening"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.media.audio/routed_device_ids_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/routed_device_ids_flag_values.textproto
deleted file mode 100644
index 4d0b624f..00000000
--- a/aconfig/trunk_staging/android.media.audio/routed_device_ids_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "routed_device_ids"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/sco_managed_by_audio_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/sco_managed_by_audio_flag_values.textproto
deleted file mode 100644
index 600f1b48..00000000
--- a/aconfig/trunk_staging/android.media.audio/sco_managed_by_audio_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "sco_managed_by_audio"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/sony_360ra_mpegh_3d_format_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/sony_360ra_mpegh_3d_format_flag_values.textproto
deleted file mode 100644
index e6d3c0ec..00000000
--- a/aconfig/trunk_staging/android.media.audio/sony_360ra_mpegh_3d_format_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "sony_360ra_mpegh_3d_format"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.media.audio/spatial_audio_settings_versioning_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/spatial_audio_settings_versioning_flag_values.textproto
deleted file mode 100644
index e22db54e..00000000
--- a/aconfig/trunk_staging/android.media.audio/spatial_audio_settings_versioning_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "spatial_audio_settings_versioning"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/spatializer_capabilities_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/spatializer_capabilities_flag_values.textproto
deleted file mode 100644
index 44215eae..00000000
--- a/aconfig/trunk_staging/android.media.audio/spatializer_capabilities_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "spatializer_capabilities"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/speaker_cleanup_usage_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/speaker_cleanup_usage_flag_values.textproto
deleted file mode 100644
index 2b4f1646..00000000
--- a/aconfig/trunk_staging/android.media.audio/speaker_cleanup_usage_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "speaker_cleanup_usage"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/speaker_layout_api_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/speaker_layout_api_flag_values.textproto
deleted file mode 100644
index fde47830..00000000
--- a/aconfig/trunk_staging/android.media.audio/speaker_layout_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "speaker_layout_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/supported_device_types_api_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/supported_device_types_api_flag_values.textproto
deleted file mode 100644
index 0ef0f557..00000000
--- a/aconfig/trunk_staging/android.media.audio/supported_device_types_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "supported_device_types_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/unify_absolute_volume_management_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/unify_absolute_volume_management_flag_values.textproto
deleted file mode 100644
index 7b914a2e..00000000
--- a/aconfig/trunk_staging/android.media.audio/unify_absolute_volume_management_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audio"
-  name: "unify_absolute_volume_management"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audiopolicy/Android.bp b/aconfig/trunk_staging/android.media.audiopolicy/Android.bp
deleted file mode 100644
index 520847a4..00000000
--- a/aconfig/trunk_staging/android.media.audiopolicy/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-android.media.audiopolicy-all",
-  package: "android.media.audiopolicy",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/android.media.audiopolicy/audio_mix_ownership_flag_values.textproto b/aconfig/trunk_staging/android.media.audiopolicy/audio_mix_ownership_flag_values.textproto
deleted file mode 100644
index 278b3a0c..00000000
--- a/aconfig/trunk_staging/android.media.audiopolicy/audio_mix_ownership_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audiopolicy"
-  name: "audio_mix_ownership"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.media.audiopolicy/audio_mix_policy_ordering_flag_values.textproto b/aconfig/trunk_staging/android.media.audiopolicy/audio_mix_policy_ordering_flag_values.textproto
deleted file mode 100644
index 3d04c586..00000000
--- a/aconfig/trunk_staging/android.media.audiopolicy/audio_mix_policy_ordering_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audiopolicy"
-  name: "audio_mix_policy_ordering"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.media.audiopolicy/audio_mix_test_api_flag_values.textproto b/aconfig/trunk_staging/android.media.audiopolicy/audio_mix_test_api_flag_values.textproto
deleted file mode 100644
index 4efcb85e..00000000
--- a/aconfig/trunk_staging/android.media.audiopolicy/audio_mix_test_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audiopolicy"
-  name: "audio_mix_test_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.media.audiopolicy/audio_policy_update_mixing_rules_api_flag_values.textproto b/aconfig/trunk_staging/android.media.audiopolicy/audio_policy_update_mixing_rules_api_flag_values.textproto
deleted file mode 100644
index 317bbc6e..00000000
--- a/aconfig/trunk_staging/android.media.audiopolicy/audio_policy_update_mixing_rules_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audiopolicy"
-  name: "audio_policy_update_mixing_rules_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audiopolicy/enable_fade_manager_configuration_flag_values.textproto b/aconfig/trunk_staging/android.media.audiopolicy/enable_fade_manager_configuration_flag_values.textproto
deleted file mode 100644
index c5202e7c..00000000
--- a/aconfig/trunk_staging/android.media.audiopolicy/enable_fade_manager_configuration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audiopolicy"
-  name: "enable_fade_manager_configuration"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audiopolicy/multi_zone_audio_flag_values.textproto b/aconfig/trunk_staging/android.media.audiopolicy/multi_zone_audio_flag_values.textproto
deleted file mode 100644
index 2c080a0c..00000000
--- a/aconfig/trunk_staging/android.media.audiopolicy/multi_zone_audio_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audiopolicy"
-  name: "multi_zone_audio"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audiopolicy/record_audio_device_aware_permission_flag_values.textproto b/aconfig/trunk_staging/android.media.audiopolicy/record_audio_device_aware_permission_flag_values.textproto
deleted file mode 100644
index da05df66..00000000
--- a/aconfig/trunk_staging/android.media.audiopolicy/record_audio_device_aware_permission_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.audiopolicy"
-  name: "record_audio_device_aware_permission"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.media.codec/Android.bp b/aconfig/trunk_staging/android.media.codec/Android.bp
deleted file mode 100644
index c104d1d5..00000000
--- a/aconfig/trunk_staging/android.media.codec/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.media.codec-all",
-    package: "android.media.codec",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.media.codec/aidl_hal_input_surface_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/aidl_hal_input_surface_flag_values.textproto
deleted file mode 100644
index 6b67d3a1..00000000
--- a/aconfig/trunk_staging/android.media.codec/aidl_hal_input_surface_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "aidl_hal_input_surface"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/apv_support_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/apv_support_flag_values.textproto
deleted file mode 100644
index 1ff08bd1..00000000
--- a/aconfig/trunk_staging/android.media.codec/apv_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "apv_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/codec_availability_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/codec_availability_flag_values.textproto
deleted file mode 100644
index 9f6a8726..00000000
--- a/aconfig/trunk_staging/android.media.codec/codec_availability_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "codec_availability"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/codec_availability_support_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/codec_availability_support_flag_values.textproto
deleted file mode 100644
index 9930aa00..00000000
--- a/aconfig/trunk_staging/android.media.codec/codec_availability_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "codec_availability_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/codec_buffer_state_cleanup_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/codec_buffer_state_cleanup_flag_values.textproto
deleted file mode 100644
index 2b0d54d7..00000000
--- a/aconfig/trunk_staging/android.media.codec/codec_buffer_state_cleanup_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "codec_buffer_state_cleanup"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/dynamic_color_aspects_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/dynamic_color_aspects_flag_values.textproto
deleted file mode 100644
index 24c40a98..00000000
--- a/aconfig/trunk_staging/android.media.codec/dynamic_color_aspects_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "dynamic_color_aspects"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/hlg_editing_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/hlg_editing_flag_values.textproto
deleted file mode 100644
index 887fb6d0..00000000
--- a/aconfig/trunk_staging/android.media.codec/hlg_editing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "hlg_editing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/in_process_sw_audio_codec_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/in_process_sw_audio_codec_flag_values.textproto
deleted file mode 100644
index 05369b6b..00000000
--- a/aconfig/trunk_staging/android.media.codec/in_process_sw_audio_codec_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "in_process_sw_audio_codec"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/in_process_sw_audio_codec_support_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/in_process_sw_audio_codec_support_flag_values.textproto
deleted file mode 100644
index 0e92d20c..00000000
--- a/aconfig/trunk_staging/android.media.codec/in_process_sw_audio_codec_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "in_process_sw_audio_codec_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/input_surface_throttle_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/input_surface_throttle_flag_values.textproto
deleted file mode 100644
index 33dad3bc..00000000
--- a/aconfig/trunk_staging/android.media.codec/input_surface_throttle_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "input_surface_throttle"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/large_audio_frame_finish_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/large_audio_frame_finish_flag_values.textproto
deleted file mode 100644
index 68f59ba8..00000000
--- a/aconfig/trunk_staging/android.media.codec/large_audio_frame_finish_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "large_audio_frame_finish"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/native_capabilites_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/native_capabilites_flag_values.textproto
deleted file mode 100644
index 23e1eeea..00000000
--- a/aconfig/trunk_staging/android.media.codec/native_capabilites_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "native_capabilites"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/null_output_surface_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/null_output_surface_flag_values.textproto
deleted file mode 100644
index d605944b..00000000
--- a/aconfig/trunk_staging/android.media.codec/null_output_surface_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "null_output_surface"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/null_output_surface_support_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/null_output_surface_support_flag_values.textproto
deleted file mode 100644
index 72e45daf..00000000
--- a/aconfig/trunk_staging/android.media.codec/null_output_surface_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "null_output_surface_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/num_input_slots_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/num_input_slots_flag_values.textproto
deleted file mode 100644
index fdea46f9..00000000
--- a/aconfig/trunk_staging/android.media.codec/num_input_slots_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "num_input_slots"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/p210_format_support_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/p210_format_support_flag_values.textproto
deleted file mode 100644
index dacfc7dd..00000000
--- a/aconfig/trunk_staging/android.media.codec/p210_format_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "p210_format_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/region_of_interest_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/region_of_interest_flag_values.textproto
deleted file mode 100644
index e0891021..00000000
--- a/aconfig/trunk_staging/android.media.codec/region_of_interest_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "region_of_interest"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/region_of_interest_support_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/region_of_interest_support_flag_values.textproto
deleted file mode 100644
index d8ad692e..00000000
--- a/aconfig/trunk_staging/android.media.codec/region_of_interest_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "region_of_interest_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/rendering_depth_removal_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/rendering_depth_removal_flag_values.textproto
deleted file mode 100644
index 20b45e3b..00000000
--- a/aconfig/trunk_staging/android.media.codec/rendering_depth_removal_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "rendering_depth_removal"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/secure_codecs_require_crypto_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/secure_codecs_require_crypto_flag_values.textproto
deleted file mode 100644
index dbafdb7d..00000000
--- a/aconfig/trunk_staging/android.media.codec/secure_codecs_require_crypto_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "secure_codecs_require_crypto"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/set_callback_stall_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/set_callback_stall_flag_values.textproto
deleted file mode 100644
index c9471ce2..00000000
--- a/aconfig/trunk_staging/android.media.codec/set_callback_stall_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "set_callback_stall"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/set_state_early_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/set_state_early_flag_values.textproto
deleted file mode 100644
index 04320fb4..00000000
--- a/aconfig/trunk_staging/android.media.codec/set_state_early_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "set_state_early"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/stop_hal_before_surface_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/stop_hal_before_surface_flag_values.textproto
deleted file mode 100644
index bb606596..00000000
--- a/aconfig/trunk_staging/android.media.codec/stop_hal_before_surface_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "stop_hal_before_surface"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/subsession_metrics_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/subsession_metrics_flag_values.textproto
deleted file mode 100644
index c2d14e82..00000000
--- a/aconfig/trunk_staging/android.media.codec/subsession_metrics_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "subsession_metrics"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/teamfood_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/teamfood_flag_values.textproto
deleted file mode 100644
index fa2b0c6a..00000000
--- a/aconfig/trunk_staging/android.media.codec/teamfood_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "teamfood"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.codec/thumbnail_block_model_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/thumbnail_block_model_flag_values.textproto
deleted file mode 100644
index c54f2b8c..00000000
--- a/aconfig/trunk_staging/android.media.codec/thumbnail_block_model_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.codec"
-  name: "thumbnail_block_model"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.midi/Android.bp b/aconfig/trunk_staging/android.media.midi/Android.bp
deleted file mode 100644
index 7107087c..00000000
--- a/aconfig/trunk_staging/android.media.midi/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-android.media.midi-all",
-  package: "android.media.midi",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/android.media.midi/virtual_ump_flag_values.textproto b/aconfig/trunk_staging/android.media.midi/virtual_ump_flag_values.textproto
deleted file mode 100644
index 9f8cc079..00000000
--- a/aconfig/trunk_staging/android.media.midi/virtual_ump_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.midi"
-  name: "virtual_ump"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.soundtrigger/Android.bp b/aconfig/trunk_staging/android.media.soundtrigger/Android.bp
deleted file mode 100644
index 87c4cc81..00000000
--- a/aconfig/trunk_staging/android.media.soundtrigger/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-android.media.soundtrigger-all",
-  package: "android.media.soundtrigger",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/android.media.soundtrigger/generic_model_api_flag_values.textproto b/aconfig/trunk_staging/android.media.soundtrigger/generic_model_api_flag_values.textproto
deleted file mode 100644
index b7392e9b..00000000
--- a/aconfig/trunk_staging/android.media.soundtrigger/generic_model_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.soundtrigger"
-  name: "generic_model_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.soundtrigger/manager_api_flag_values.textproto b/aconfig/trunk_staging/android.media.soundtrigger/manager_api_flag_values.textproto
deleted file mode 100644
index 9c645213..00000000
--- a/aconfig/trunk_staging/android.media.soundtrigger/manager_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.soundtrigger"
-  name: "manager_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.swcodec.flags/Android.bp b/aconfig/trunk_staging/android.media.swcodec.flags/Android.bp
deleted file mode 100644
index f2b421f0..00000000
--- a/aconfig/trunk_staging/android.media.swcodec.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.media.swcodec.flags-all",
-    package: "android.media.swcodec.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.media.swcodec.flags/apv_software_codec_flag_values.textproto b/aconfig/trunk_staging/android.media.swcodec.flags/apv_software_codec_flag_values.textproto
deleted file mode 100644
index c9376077..00000000
--- a/aconfig/trunk_staging/android.media.swcodec.flags/apv_software_codec_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.swcodec.flags"
-  name: "apv_software_codec"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.media.swcodec.flags/mpeg2_keep_threads_active_flag_values.textproto b/aconfig/trunk_staging/android.media.swcodec.flags/mpeg2_keep_threads_active_flag_values.textproto
deleted file mode 100644
index e2652890..00000000
--- a/aconfig/trunk_staging/android.media.swcodec.flags/mpeg2_keep_threads_active_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.swcodec.flags"
-  name: "mpeg2_keep_threads_active"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.media.tv.flags/Android.bp b/aconfig/trunk_staging/android.media.tv.flags/Android.bp
deleted file mode 100644
index bdbf2f82..00000000
--- a/aconfig/trunk_staging/android.media.tv.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.media.tv.flags-all",
-    package: "android.media.tv.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.media.tv.flags/apply_picture_profiles_flag_values.textproto b/aconfig/trunk_staging/android.media.tv.flags/apply_picture_profiles_flag_values.textproto
deleted file mode 100644
index 13712b44..00000000
--- a/aconfig/trunk_staging/android.media.tv.flags/apply_picture_profiles_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.tv.flags"
-  name: "apply_picture_profiles"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.tv.flags/broadcast_visibility_types_flag_values.textproto b/aconfig/trunk_staging/android.media.tv.flags/broadcast_visibility_types_flag_values.textproto
deleted file mode 100644
index 16fc58bf..00000000
--- a/aconfig/trunk_staging/android.media.tv.flags/broadcast_visibility_types_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.tv.flags"
-  name: "broadcast_visibility_types"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.tv.flags/enable_ad_service_fw_flag_values.textproto b/aconfig/trunk_staging/android.media.tv.flags/enable_ad_service_fw_flag_values.textproto
deleted file mode 100644
index 90186153..00000000
--- a/aconfig/trunk_staging/android.media.tv.flags/enable_ad_service_fw_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.tv.flags"
-  name: "enable_ad_service_fw"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.tv.flags/hdmi_control_collect_physical_address_flag_values.textproto b/aconfig/trunk_staging/android.media.tv.flags/hdmi_control_collect_physical_address_flag_values.textproto
deleted file mode 100644
index 97eb2dec..00000000
--- a/aconfig/trunk_staging/android.media.tv.flags/hdmi_control_collect_physical_address_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.tv.flags"
-  name: "hdmi_control_collect_physical_address"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.tv.flags/hdmi_control_enhanced_behavior_flag_values.textproto b/aconfig/trunk_staging/android.media.tv.flags/hdmi_control_enhanced_behavior_flag_values.textproto
deleted file mode 100644
index 7bebd25d..00000000
--- a/aconfig/trunk_staging/android.media.tv.flags/hdmi_control_enhanced_behavior_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.tv.flags"
-  name: "hdmi_control_enhanced_behavior"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.tv.flags/kids_mode_tvdb_sharing_flag_values.textproto b/aconfig/trunk_staging/android.media.tv.flags/kids_mode_tvdb_sharing_flag_values.textproto
deleted file mode 100644
index 30e79007..00000000
--- a/aconfig/trunk_staging/android.media.tv.flags/kids_mode_tvdb_sharing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.tv.flags"
-  name: "kids_mode_tvdb_sharing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.tv.flags/media_quality_fw_bugfix_flag_values.textproto b/aconfig/trunk_staging/android.media.tv.flags/media_quality_fw_bugfix_flag_values.textproto
deleted file mode 100644
index 3b1cdba2..00000000
--- a/aconfig/trunk_staging/android.media.tv.flags/media_quality_fw_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.tv.flags"
-  name: "media_quality_fw_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.tv.flags/media_quality_fw_flag_values.textproto b/aconfig/trunk_staging/android.media.tv.flags/media_quality_fw_flag_values.textproto
deleted file mode 100644
index a01c16e5..00000000
--- a/aconfig/trunk_staging/android.media.tv.flags/media_quality_fw_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.tv.flags"
-  name: "media_quality_fw"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.tv.flags/mediacas_update_client_profile_priority_flag_values.textproto b/aconfig/trunk_staging/android.media.tv.flags/mediacas_update_client_profile_priority_flag_values.textproto
deleted file mode 100644
index ff485705..00000000
--- a/aconfig/trunk_staging/android.media.tv.flags/mediacas_update_client_profile_priority_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.tv.flags"
-  name: "mediacas_update_client_profile_priority"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.tv.flags/set_resource_holder_retain_flag_values.textproto b/aconfig/trunk_staging/android.media.tv.flags/set_resource_holder_retain_flag_values.textproto
deleted file mode 100644
index 2ff102ee..00000000
--- a/aconfig/trunk_staging/android.media.tv.flags/set_resource_holder_retain_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.tv.flags"
-  name: "set_resource_holder_retain"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.tv.flags/tiaf_v_apis_flag_values.textproto b/aconfig/trunk_staging/android.media.tv.flags/tiaf_v_apis_flag_values.textproto
deleted file mode 100644
index 5a606d2b..00000000
--- a/aconfig/trunk_staging/android.media.tv.flags/tiaf_v_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.tv.flags"
-  name: "tiaf_v_apis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.tv.flags/tif_extension_standardization_bugfix_flag_values.textproto b/aconfig/trunk_staging/android.media.tv.flags/tif_extension_standardization_bugfix_flag_values.textproto
deleted file mode 100644
index fa1b4b4d..00000000
--- a/aconfig/trunk_staging/android.media.tv.flags/tif_extension_standardization_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.tv.flags"
-  name: "tif_extension_standardization_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.tv.flags/tif_extension_standardization_flag_values.textproto b/aconfig/trunk_staging/android.media.tv.flags/tif_extension_standardization_flag_values.textproto
deleted file mode 100644
index a66eeffb..00000000
--- a/aconfig/trunk_staging/android.media.tv.flags/tif_extension_standardization_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.tv.flags"
-  name: "tif_extension_standardization"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.tv.flags/tif_unbind_inactive_tis_flag_values.textproto b/aconfig/trunk_staging/android.media.tv.flags/tif_unbind_inactive_tis_flag_values.textproto
deleted file mode 100644
index bd1568b1..00000000
--- a/aconfig/trunk_staging/android.media.tv.flags/tif_unbind_inactive_tis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.tv.flags"
-  name: "tif_unbind_inactive_tis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.tv.flags/tuner_w_apis_flag_values.textproto b/aconfig/trunk_staging/android.media.tv.flags/tuner_w_apis_flag_values.textproto
deleted file mode 100644
index 1c6098fd..00000000
--- a/aconfig/trunk_staging/android.media.tv.flags/tuner_w_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.media.tv.flags"
-  name: "tuner_w_apis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.mmd.flags/Android.bp b/aconfig/trunk_staging/android.mmd.flags/Android.bp
deleted file mode 100644
index 9bb389c1..00000000
--- a/aconfig/trunk_staging/android.mmd.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.mmd.flags-all",
-    package: "android.mmd.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.mmd.flags/mmd_enabled_flag_values.textproto b/aconfig/trunk_staging/android.mmd.flags/mmd_enabled_flag_values.textproto
deleted file mode 100644
index af365502..00000000
--- a/aconfig/trunk_staging/android.mmd.flags/mmd_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.mmd.flags"
-  name: "mmd_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/Android.bp b/aconfig/trunk_staging/android.multiuser/Android.bp
deleted file mode 100644
index f554108d..00000000
--- a/aconfig/trunk_staging/android.multiuser/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.multiuser-all",
-    package: "android.multiuser",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.multiuser/add_launcher_user_config_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/add_launcher_user_config_flag_values.textproto
deleted file mode 100644
index 06fb9e12..00000000
--- a/aconfig/trunk_staging/android.multiuser/add_launcher_user_config_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "add_launcher_user_config"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/add_ui_for_sounds_from_background_users_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/add_ui_for_sounds_from_background_users_flag_values.textproto
deleted file mode 100644
index c61f292a..00000000
--- a/aconfig/trunk_staging/android.multiuser/add_ui_for_sounds_from_background_users_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "add_ui_for_sounds_from_background_users"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/allow_main_user_to_access_blocked_number_provider_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/allow_main_user_to_access_blocked_number_provider_flag_values.textproto
deleted file mode 100644
index 62de7315..00000000
--- a/aconfig/trunk_staging/android.multiuser/allow_main_user_to_access_blocked_number_provider_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "allow_main_user_to_access_blocked_number_provider"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/allow_resolver_sheet_for_private_space_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/allow_resolver_sheet_for_private_space_flag_values.textproto
deleted file mode 100644
index d65aa144..00000000
--- a/aconfig/trunk_staging/android.multiuser/allow_resolver_sheet_for_private_space_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "allow_resolver_sheet_for_private_space"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/allow_supervising_profile_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/allow_supervising_profile_flag_values.textproto
deleted file mode 100644
index 7e8384e5..00000000
--- a/aconfig/trunk_staging/android.multiuser/allow_supervising_profile_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "allow_supervising_profile"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/avatar_sync_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/avatar_sync_flag_values.textproto
deleted file mode 100644
index 03dbec40..00000000
--- a/aconfig/trunk_staging/android.multiuser/avatar_sync_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "avatar_sync"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.multiuser/bind_wallpaper_service_on_its_own_thread_during_a_user_switch_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/bind_wallpaper_service_on_its_own_thread_during_a_user_switch_flag_values.textproto
deleted file mode 100644
index bcb0e448..00000000
--- a/aconfig/trunk_staging/android.multiuser/bind_wallpaper_service_on_its_own_thread_during_a_user_switch_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "bind_wallpaper_service_on_its_own_thread_during_a_user_switch"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/block_private_space_creation_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/block_private_space_creation_flag_values.textproto
deleted file mode 100644
index 77284a1c..00000000
--- a/aconfig/trunk_staging/android.multiuser/block_private_space_creation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "block_private_space_creation"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.multiuser/cache_profile_ids_read_only_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/cache_profile_ids_read_only_flag_values.textproto
deleted file mode 100644
index f0396dab..00000000
--- a/aconfig/trunk_staging/android.multiuser/cache_profile_ids_read_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "cache_profile_ids_read_only"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.multiuser/cache_profile_parent_read_only_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/cache_profile_parent_read_only_flag_values.textproto
deleted file mode 100644
index 8e8aef42..00000000
--- a/aconfig/trunk_staging/android.multiuser/cache_profile_parent_read_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "cache_profile_parent_read_only"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.multiuser/cache_profiles_read_only_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/cache_profiles_read_only_flag_values.textproto
deleted file mode 100644
index 575c4e55..00000000
--- a/aconfig/trunk_staging/android.multiuser/cache_profiles_read_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "cache_profiles_read_only"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.multiuser/cache_quiet_mode_state_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/cache_quiet_mode_state_flag_values.textproto
deleted file mode 100644
index a7a58682..00000000
--- a/aconfig/trunk_staging/android.multiuser/cache_quiet_mode_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "cache_quiet_mode_state"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/cache_user_info_read_only_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/cache_user_info_read_only_flag_values.textproto
deleted file mode 100644
index 0b46163a..00000000
--- a/aconfig/trunk_staging/android.multiuser/cache_user_info_read_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "cache_user_info_read_only"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.multiuser/cache_user_properties_correctly_read_only_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/cache_user_properties_correctly_read_only_flag_values.textproto
deleted file mode 100644
index 31494deb..00000000
--- a/aconfig/trunk_staging/android.multiuser/cache_user_properties_correctly_read_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "cache_user_properties_correctly_read_only"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.multiuser/cache_user_serial_number_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/cache_user_serial_number_flag_values.textproto
deleted file mode 100644
index 77e26db3..00000000
--- a/aconfig/trunk_staging/android.multiuser/cache_user_serial_number_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "cache_user_serial_number"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/cache_user_serial_number_read_only_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/cache_user_serial_number_read_only_flag_values.textproto
deleted file mode 100644
index 1d985e15..00000000
--- a/aconfig/trunk_staging/android.multiuser/cache_user_serial_number_read_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "cache_user_serial_number_read_only"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.multiuser/caches_not_invalidated_at_start_read_only_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/caches_not_invalidated_at_start_read_only_flag_values.textproto
deleted file mode 100644
index 1cfea6ef..00000000
--- a/aconfig/trunk_staging/android.multiuser/caches_not_invalidated_at_start_read_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "caches_not_invalidated_at_start_read_only"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.multiuser/caching_development_improvements_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/caching_development_improvements_flag_values.textproto
deleted file mode 100644
index edd8b276..00000000
--- a/aconfig/trunk_staging/android.multiuser/caching_development_improvements_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "caching_development_improvements"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.multiuser/delete_private_space_from_reset_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/delete_private_space_from_reset_flag_values.textproto
deleted file mode 100644
index 36b3e849..00000000
--- a/aconfig/trunk_staging/android.multiuser/delete_private_space_from_reset_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "delete_private_space_from_reset"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/disable_private_space_items_on_home_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/disable_private_space_items_on_home_flag_values.textproto
deleted file mode 100644
index a4ad2008..00000000
--- a/aconfig/trunk_staging/android.multiuser/disable_private_space_items_on_home_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "disable_private_space_items_on_home"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/enable_biometrics_to_unlock_private_space_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/enable_biometrics_to_unlock_private_space_flag_values.textproto
deleted file mode 100644
index ef86c96f..00000000
--- a/aconfig/trunk_staging/android.multiuser/enable_biometrics_to_unlock_private_space_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "enable_biometrics_to_unlock_private_space"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/enable_hiding_profiles_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/enable_hiding_profiles_flag_values.textproto
deleted file mode 100644
index abe3d341..00000000
--- a/aconfig/trunk_staging/android.multiuser/enable_hiding_profiles_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "enable_hiding_profiles"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/enable_launcher_apps_hidden_profile_checks_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/enable_launcher_apps_hidden_profile_checks_flag_values.textproto
deleted file mode 100644
index b76c95c5..00000000
--- a/aconfig/trunk_staging/android.multiuser/enable_launcher_apps_hidden_profile_checks_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "enable_launcher_apps_hidden_profile_checks"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/enable_permission_to_access_hidden_profiles_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/enable_permission_to_access_hidden_profiles_flag_values.textproto
deleted file mode 100644
index 49fd1bbd..00000000
--- a/aconfig/trunk_staging/android.multiuser/enable_permission_to_access_hidden_profiles_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "enable_permission_to_access_hidden_profiles"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/enable_private_space_autolock_on_restarts_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/enable_private_space_autolock_on_restarts_flag_values.textproto
deleted file mode 100644
index 12c3bde9..00000000
--- a/aconfig/trunk_staging/android.multiuser/enable_private_space_autolock_on_restarts_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "enable_private_space_autolock_on_restarts"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/enable_private_space_features_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/enable_private_space_features_flag_values.textproto
deleted file mode 100644
index e4779aa0..00000000
--- a/aconfig/trunk_staging/android.multiuser/enable_private_space_features_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "enable_private_space_features"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/enable_private_space_intent_redirection_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/enable_private_space_intent_redirection_flag_values.textproto
deleted file mode 100644
index a127e9f3..00000000
--- a/aconfig/trunk_staging/android.multiuser/enable_private_space_intent_redirection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "enable_private_space_intent_redirection"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/enable_ps_sensitive_notifications_toggle_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/enable_ps_sensitive_notifications_toggle_flag_values.textproto
deleted file mode 100644
index 41f970b2..00000000
--- a/aconfig/trunk_staging/android.multiuser/enable_ps_sensitive_notifications_toggle_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "enable_ps_sensitive_notifications_toggle"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/enable_system_user_only_for_services_and_providers_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/enable_system_user_only_for_services_and_providers_flag_values.textproto
deleted file mode 100644
index 980c4e1a..00000000
--- a/aconfig/trunk_staging/android.multiuser/enable_system_user_only_for_services_and_providers_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "enable_system_user_only_for_services_and_providers"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.multiuser/fix_avatar_concurrent_file_write_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/fix_avatar_concurrent_file_write_flag_values.textproto
deleted file mode 100644
index 39778ee8..00000000
--- a/aconfig/trunk_staging/android.multiuser/fix_avatar_concurrent_file_write_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "fix_avatar_concurrent_file_write"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/fix_avatar_cross_user_leak_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/fix_avatar_cross_user_leak_flag_values.textproto
deleted file mode 100644
index 61799e9c..00000000
--- a/aconfig/trunk_staging/android.multiuser/fix_avatar_cross_user_leak_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "fix_avatar_cross_user_leak"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/fix_avatar_picker_not_responding_for_new_user_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/fix_avatar_picker_not_responding_for_new_user_flag_values.textproto
deleted file mode 100644
index bf01f22d..00000000
--- a/aconfig/trunk_staging/android.multiuser/fix_avatar_picker_not_responding_for_new_user_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "fix_avatar_picker_not_responding_for_new_user"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/fix_avatar_picker_read_back_order_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/fix_avatar_picker_read_back_order_flag_values.textproto
deleted file mode 100644
index cde11db0..00000000
--- a/aconfig/trunk_staging/android.multiuser/fix_avatar_picker_read_back_order_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "fix_avatar_picker_read_back_order"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/fix_avatar_picker_selected_read_back_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/fix_avatar_picker_selected_read_back_flag_values.textproto
deleted file mode 100644
index c020cf50..00000000
--- a/aconfig/trunk_staging/android.multiuser/fix_avatar_picker_selected_read_back_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "fix_avatar_picker_selected_read_back"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/fix_disabling_of_mu_toggle_when_restriction_applied_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/fix_disabling_of_mu_toggle_when_restriction_applied_flag_values.textproto
deleted file mode 100644
index 3a98c889..00000000
--- a/aconfig/trunk_staging/android.multiuser/fix_disabling_of_mu_toggle_when_restriction_applied_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "fix_disabling_of_mu_toggle_when_restriction_applied"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/fix_get_user_property_cache_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/fix_get_user_property_cache_flag_values.textproto
deleted file mode 100644
index 8998f5bd..00000000
--- a/aconfig/trunk_staging/android.multiuser/fix_get_user_property_cache_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "fix_get_user_property_cache"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/fix_large_display_private_space_settings_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/fix_large_display_private_space_settings_flag_values.textproto
deleted file mode 100644
index 7b76334b..00000000
--- a/aconfig/trunk_staging/android.multiuser/fix_large_display_private_space_settings_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "fix_large_display_private_space_settings"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/get_user_switchability_permission_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/get_user_switchability_permission_flag_values.textproto
deleted file mode 100644
index 39dcfe30..00000000
--- a/aconfig/trunk_staging/android.multiuser/get_user_switchability_permission_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "get_user_switchability_permission"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/handle_interleaved_settings_for_private_space_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/handle_interleaved_settings_for_private_space_flag_values.textproto
deleted file mode 100644
index 4c37a637..00000000
--- a/aconfig/trunk_staging/android.multiuser/handle_interleaved_settings_for_private_space_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "handle_interleaved_settings_for_private_space"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/ignore_restrictions_when_deleting_private_profile_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/ignore_restrictions_when_deleting_private_profile_flag_values.textproto
deleted file mode 100644
index 23296b6a..00000000
--- a/aconfig/trunk_staging/android.multiuser/ignore_restrictions_when_deleting_private_profile_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "ignore_restrictions_when_deleting_private_profile"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/invalidate_cache_on_users_changed_read_only_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/invalidate_cache_on_users_changed_read_only_flag_values.textproto
deleted file mode 100644
index ef098f9b..00000000
--- a/aconfig/trunk_staging/android.multiuser/invalidate_cache_on_users_changed_read_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "invalidate_cache_on_users_changed_read_only"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.multiuser/modify_private_space_secondary_unlock_setup_flow_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/modify_private_space_secondary_unlock_setup_flow_flag_values.textproto
deleted file mode 100644
index 4d647225..00000000
--- a/aconfig/trunk_staging/android.multiuser/modify_private_space_secondary_unlock_setup_flow_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "modify_private_space_secondary_unlock_setup_flow"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/move_quiet_mode_operations_to_separate_thread_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/move_quiet_mode_operations_to_separate_thread_flag_values.textproto
deleted file mode 100644
index a07aa2f2..00000000
--- a/aconfig/trunk_staging/android.multiuser/move_quiet_mode_operations_to_separate_thread_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "move_quiet_mode_operations_to_separate_thread"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/multiple_alarm_notifications_support_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/multiple_alarm_notifications_support_flag_values.textproto
deleted file mode 100644
index a2909ba1..00000000
--- a/aconfig/trunk_staging/android.multiuser/multiple_alarm_notifications_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "multiple_alarm_notifications_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/new_multiuser_settings_ux_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/new_multiuser_settings_ux_flag_values.textproto
deleted file mode 100644
index 709b9720..00000000
--- a/aconfig/trunk_staging/android.multiuser/new_multiuser_settings_ux_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "new_multiuser_settings_ux"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/place_add_user_dialog_within_activity_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/place_add_user_dialog_within_activity_flag_values.textproto
deleted file mode 100644
index 9f117ff7..00000000
--- a/aconfig/trunk_staging/android.multiuser/place_add_user_dialog_within_activity_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "place_add_user_dialog_within_activity"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/private_space_search_illustration_config_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/private_space_search_illustration_config_flag_values.textproto
deleted file mode 100644
index 6f047705..00000000
--- a/aconfig/trunk_staging/android.multiuser/private_space_search_illustration_config_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "private_space_search_illustration_config"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/property_invalidated_cache_bypass_mismatched_uids_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/property_invalidated_cache_bypass_mismatched_uids_flag_values.textproto
deleted file mode 100644
index 86f722d7..00000000
--- a/aconfig/trunk_staging/android.multiuser/property_invalidated_cache_bypass_mismatched_uids_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "property_invalidated_cache_bypass_mismatched_uids"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.multiuser/reorder_wallpaper_during_user_switch_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/reorder_wallpaper_during_user_switch_flag_values.textproto
deleted file mode 100644
index 9a9df7a9..00000000
--- a/aconfig/trunk_staging/android.multiuser/reorder_wallpaper_during_user_switch_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "reorder_wallpaper_during_user_switch"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/restrict_quiet_mode_credential_bug_fix_to_managed_profiles_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/restrict_quiet_mode_credential_bug_fix_to_managed_profiles_flag_values.textproto
deleted file mode 100644
index dbfd4c4b..00000000
--- a/aconfig/trunk_staging/android.multiuser/restrict_quiet_mode_credential_bug_fix_to_managed_profiles_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "restrict_quiet_mode_credential_bug_fix_to_managed_profiles"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/save_global_and_guest_restrictions_on_system_user_xml_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/save_global_and_guest_restrictions_on_system_user_xml_flag_values.textproto
deleted file mode 100644
index 259a1ee5..00000000
--- a/aconfig/trunk_staging/android.multiuser/save_global_and_guest_restrictions_on_system_user_xml_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "save_global_and_guest_restrictions_on_system_user_xml"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/save_global_and_guest_restrictions_on_system_user_xml_read_only_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/save_global_and_guest_restrictions_on_system_user_xml_read_only_flag_values.textproto
deleted file mode 100644
index c6302858..00000000
--- a/aconfig/trunk_staging/android.multiuser/save_global_and_guest_restrictions_on_system_user_xml_read_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "save_global_and_guest_restrictions_on_system_user_xml_read_only"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.multiuser/schedule_stop_of_background_user_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/schedule_stop_of_background_user_flag_values.textproto
deleted file mode 100644
index 973dc74d..00000000
--- a/aconfig/trunk_staging/android.multiuser/schedule_stop_of_background_user_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "schedule_stop_of_background_user"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/set_power_mode_during_user_switch_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/set_power_mode_during_user_switch_flag_values.textproto
deleted file mode 100644
index 92ff6918..00000000
--- a/aconfig/trunk_staging/android.multiuser/set_power_mode_during_user_switch_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "set_power_mode_during_user_switch"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/show_custom_unlock_title_inside_private_profile_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/show_custom_unlock_title_inside_private_profile_flag_values.textproto
deleted file mode 100644
index 33689727..00000000
--- a/aconfig/trunk_staging/android.multiuser/show_custom_unlock_title_inside_private_profile_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "show_custom_unlock_title_inside_private_profile"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/show_different_creation_error_for_unsupported_devices_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/show_different_creation_error_for_unsupported_devices_flag_values.textproto
deleted file mode 100644
index 7a0475f1..00000000
--- a/aconfig/trunk_staging/android.multiuser/show_different_creation_error_for_unsupported_devices_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "show_different_creation_error_for_unsupported_devices"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/show_set_screen_lock_dialog_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/show_set_screen_lock_dialog_flag_values.textproto
deleted file mode 100644
index 5d27c9cd..00000000
--- a/aconfig/trunk_staging/android.multiuser/show_set_screen_lock_dialog_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "show_set_screen_lock_dialog"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/stop_previous_user_apps_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/stop_previous_user_apps_flag_values.textproto
deleted file mode 100644
index 2263e9d7..00000000
--- a/aconfig/trunk_staging/android.multiuser/stop_previous_user_apps_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "stop_previous_user_apps"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/support_autolock_for_private_space_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/support_autolock_for_private_space_flag_values.textproto
deleted file mode 100644
index 418e2cf6..00000000
--- a/aconfig/trunk_staging/android.multiuser/support_autolock_for_private_space_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "support_autolock_for_private_space"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/support_communal_profile_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/support_communal_profile_flag_values.textproto
deleted file mode 100644
index d79adc47..00000000
--- a/aconfig/trunk_staging/android.multiuser/support_communal_profile_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "support_communal_profile"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/unicorn_mode_refactoring_for_hsum_read_only_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/unicorn_mode_refactoring_for_hsum_read_only_flag_values.textproto
deleted file mode 100644
index 8918f62a..00000000
--- a/aconfig/trunk_staging/android.multiuser/unicorn_mode_refactoring_for_hsum_read_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "unicorn_mode_refactoring_for_hsum_read_only"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.multiuser/use_all_cpus_during_user_switch_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/use_all_cpus_during_user_switch_flag_values.textproto
deleted file mode 100644
index d0cd4db8..00000000
--- a/aconfig/trunk_staging/android.multiuser/use_all_cpus_during_user_switch_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "use_all_cpus_during_user_switch"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/use_private_space_icon_in_biometric_prompt_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/use_private_space_icon_in_biometric_prompt_flag_values.textproto
deleted file mode 100644
index e3c0c44e..00000000
--- a/aconfig/trunk_staging/android.multiuser/use_private_space_icon_in_biometric_prompt_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "use_private_space_icon_in_biometric_prompt"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.multiuser/use_unified_resources_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/use_unified_resources_flag_values.textproto
deleted file mode 100644
index 4b3ba594..00000000
--- a/aconfig/trunk_staging/android.multiuser/use_unified_resources_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.multiuser"
-  name: "use_unified_resources"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.net.http/Android.bp b/aconfig/trunk_staging/android.net.http/Android.bp
deleted file mode 100644
index df35578d..00000000
--- a/aconfig/trunk_staging/android.net.http/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.net.http-all",
-    package: "android.net.http",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.net.http/preload_httpengine_in_zygote_flag_values.textproto b/aconfig/trunk_staging/android.net.http/preload_httpengine_in_zygote_flag_values.textproto
deleted file mode 100644
index 470f98db..00000000
--- a/aconfig/trunk_staging/android.net.http/preload_httpengine_in_zygote_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.net.http"
-  name: "preload_httpengine_in_zygote"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.net.http/preload_httpengine_java_impl_classes_flag_values.textproto b/aconfig/trunk_staging/android.net.http/preload_httpengine_java_impl_classes_flag_values.textproto
deleted file mode 100644
index 0202fa62..00000000
--- a/aconfig/trunk_staging/android.net.http/preload_httpengine_java_impl_classes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.net.http"
-  name: "preload_httpengine_java_impl_classes"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.net.http/preload_httpengine_shared_library_flag_values.textproto b/aconfig/trunk_staging/android.net.http/preload_httpengine_shared_library_flag_values.textproto
deleted file mode 100644
index b015e984..00000000
--- a/aconfig/trunk_staging/android.net.http/preload_httpengine_shared_library_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.net.http"
-  name: "preload_httpengine_shared_library"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.net.platform.flags/Android.bp b/aconfig/trunk_staging/android.net.platform.flags/Android.bp
deleted file mode 100644
index dc9fd08d..00000000
--- a/aconfig/trunk_staging/android.net.platform.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.net.platform.flags-all",
-    package: "android.net.platform.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.net.platform.flags/deprecate_network_policy_callback_flag_values.textproto b/aconfig/trunk_staging/android.net.platform.flags/deprecate_network_policy_callback_flag_values.textproto
deleted file mode 100644
index 9cfca524..00000000
--- a/aconfig/trunk_staging/android.net.platform.flags/deprecate_network_policy_callback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.net.platform.flags"
-  name: "deprecate_network_policy_callback"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.net.platform.flags/mdns_improvement_for_25q2_flag_values.textproto b/aconfig/trunk_staging/android.net.platform.flags/mdns_improvement_for_25q2_flag_values.textproto
deleted file mode 100644
index ba4af580..00000000
--- a/aconfig/trunk_staging/android.net.platform.flags/mdns_improvement_for_25q2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.net.platform.flags"
-  name: "mdns_improvement_for_25q2"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.net.platform.flags/powered_off_finding_platform_flag_values.textproto b/aconfig/trunk_staging/android.net.platform.flags/powered_off_finding_platform_flag_values.textproto
deleted file mode 100644
index 36d3dc25..00000000
--- a/aconfig/trunk_staging/android.net.platform.flags/powered_off_finding_platform_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.net.platform.flags"
-  name: "powered_off_finding_platform"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.net.platform.flags/register_nsd_offload_engine_flag_values.textproto b/aconfig/trunk_staging/android.net.platform.flags/register_nsd_offload_engine_flag_values.textproto
deleted file mode 100644
index 2d3cff11..00000000
--- a/aconfig/trunk_staging/android.net.platform.flags/register_nsd_offload_engine_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.net.platform.flags"
-  name: "register_nsd_offload_engine"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.net.platform.flags/x509_extensions_certificate_transparency_flag_values.textproto b/aconfig/trunk_staging/android.net.platform.flags/x509_extensions_certificate_transparency_flag_values.textproto
deleted file mode 100644
index 222387b9..00000000
--- a/aconfig/trunk_staging/android.net.platform.flags/x509_extensions_certificate_transparency_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.net.platform.flags"
-  name: "x509_extensions_certificate_transparency"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.net.vcn/Android.bp b/aconfig/trunk_staging/android.net.vcn/Android.bp
deleted file mode 100644
index a72c7bb3..00000000
--- a/aconfig/trunk_staging/android.net.vcn/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.net.vcn-all",
-    package: "android.net.vcn",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.net.vcn/TEST_MAPPING b/aconfig/trunk_staging/android.net.vcn/TEST_MAPPING
deleted file mode 100644
index 48ee9340..00000000
--- a/aconfig/trunk_staging/android.net.vcn/TEST_MAPPING
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "imports": [
-    {
-      "path": "frameworks/base/services/core/java/com/android/server/vcn"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/aconfig/trunk_staging/android.net.vcn/allow_disable_ipsec_loss_detector_flag_values.textproto b/aconfig/trunk_staging/android.net.vcn/allow_disable_ipsec_loss_detector_flag_values.textproto
deleted file mode 100644
index 51d69e46..00000000
--- a/aconfig/trunk_staging/android.net.vcn/allow_disable_ipsec_loss_detector_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.net.vcn"
-  name: "allow_disable_ipsec_loss_detector"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.net.vcn/enforce_main_user_flag_values.textproto b/aconfig/trunk_staging/android.net.vcn/enforce_main_user_flag_values.textproto
deleted file mode 100644
index d9162326..00000000
--- a/aconfig/trunk_staging/android.net.vcn/enforce_main_user_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.net.vcn"
-  name: "enforce_main_user"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.net.vcn/evaluate_ipsec_loss_on_lp_nc_change_flag_values.textproto b/aconfig/trunk_staging/android.net.vcn/evaluate_ipsec_loss_on_lp_nc_change_flag_values.textproto
deleted file mode 100644
index d7d1d9e9..00000000
--- a/aconfig/trunk_staging/android.net.vcn/evaluate_ipsec_loss_on_lp_nc_change_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.net.vcn"
-  name: "evaluate_ipsec_loss_on_lp_nc_change"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.net.vcn/handle_seq_num_leap_flag_values.textproto b/aconfig/trunk_staging/android.net.vcn/handle_seq_num_leap_flag_values.textproto
deleted file mode 100644
index ff340c60..00000000
--- a/aconfig/trunk_staging/android.net.vcn/handle_seq_num_leap_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.net.vcn"
-  name: "handle_seq_num_leap"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.net.vcn/mainline_vcn_module_api_flag_values.textproto b/aconfig/trunk_staging/android.net.vcn/mainline_vcn_module_api_flag_values.textproto
deleted file mode 100644
index ebf73951..00000000
--- a/aconfig/trunk_staging/android.net.vcn/mainline_vcn_module_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.net.vcn"
-  name: "mainline_vcn_module_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.net.vcn/network_metric_monitor_flag_values.textproto b/aconfig/trunk_staging/android.net.vcn/network_metric_monitor_flag_values.textproto
deleted file mode 100644
index e56deadc..00000000
--- a/aconfig/trunk_staging/android.net.vcn/network_metric_monitor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.net.vcn"
-  name: "network_metric_monitor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.net.vcn/safe_mode_config_flag_values.textproto b/aconfig/trunk_staging/android.net.vcn/safe_mode_config_flag_values.textproto
deleted file mode 100644
index f97bbc71..00000000
--- a/aconfig/trunk_staging/android.net.vcn/safe_mode_config_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.net.vcn"
-  name: "safe_mode_config"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.net.vcn/safe_mode_timeout_config_flag_values.textproto b/aconfig/trunk_staging/android.net.vcn/safe_mode_timeout_config_flag_values.textproto
deleted file mode 100644
index 9fea3d48..00000000
--- a/aconfig/trunk_staging/android.net.vcn/safe_mode_timeout_config_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.net.vcn"
-  name: "safe_mode_timeout_config"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.net.vcn/validate_network_on_ipsec_loss_flag_values.textproto b/aconfig/trunk_staging/android.net.vcn/validate_network_on_ipsec_loss_flag_values.textproto
deleted file mode 100644
index 62958a1c..00000000
--- a/aconfig/trunk_staging/android.net.vcn/validate_network_on_ipsec_loss_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.net.vcn"
-  name: "validate_network_on_ipsec_loss"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.net.wifi.flags/Android.bp b/aconfig/trunk_staging/android.net.wifi.flags/Android.bp
deleted file mode 100644
index d20052fc..00000000
--- a/aconfig/trunk_staging/android.net.wifi.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.net.wifi.flags-all",
-    package: "android.net.wifi.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.net.wifi.flags/get_device_cross_akm_roaming_support_flag_values.textproto b/aconfig/trunk_staging/android.net.wifi.flags/get_device_cross_akm_roaming_support_flag_values.textproto
deleted file mode 100644
index d3e542cc..00000000
--- a/aconfig/trunk_staging/android.net.wifi.flags/get_device_cross_akm_roaming_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.net.wifi.flags"
-  name: "get_device_cross_akm_roaming_support"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.net.wifi.flags/legacy_keystore_to_wifi_blobstore_migration_read_only_flag_values.textproto b/aconfig/trunk_staging/android.net.wifi.flags/legacy_keystore_to_wifi_blobstore_migration_read_only_flag_values.textproto
deleted file mode 100644
index 59ef55e4..00000000
--- a/aconfig/trunk_staging/android.net.wifi.flags/legacy_keystore_to_wifi_blobstore_migration_read_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.net.wifi.flags"
-  name: "legacy_keystore_to_wifi_blobstore_migration_read_only"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.net.wifi.flags/network_provider_battery_charging_status_flag_values.textproto b/aconfig/trunk_staging/android.net.wifi.flags/network_provider_battery_charging_status_flag_values.textproto
deleted file mode 100644
index 1bebc0ec..00000000
--- a/aconfig/trunk_staging/android.net.wifi.flags/network_provider_battery_charging_status_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.net.wifi.flags"
-  name: "network_provider_battery_charging_status"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.net.wifi.flags/usd_flag_values.textproto b/aconfig/trunk_staging/android.net.wifi.flags/usd_flag_values.textproto
deleted file mode 100644
index 786ad0e1..00000000
--- a/aconfig/trunk_staging/android.net.wifi.flags/usd_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.net.wifi.flags"
-  name: "usd"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.nfc/Android.bp b/aconfig/trunk_staging/android.nfc/Android.bp
deleted file mode 100644
index f1882cd3..00000000
--- a/aconfig/trunk_staging/android.nfc/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.nfc-all",
-    package: "android.nfc",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.nfc/enable_card_emulation_euicc_flag_values.textproto b/aconfig/trunk_staging/android.nfc/enable_card_emulation_euicc_flag_values.textproto
deleted file mode 100644
index 936588d3..00000000
--- a/aconfig/trunk_staging/android.nfc/enable_card_emulation_euicc_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.nfc"
-  name: "enable_card_emulation_euicc"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.nfc/enable_nfc_mainline_flag_values.textproto b/aconfig/trunk_staging/android.nfc/enable_nfc_mainline_flag_values.textproto
deleted file mode 100644
index 6cc7efc9..00000000
--- a/aconfig/trunk_staging/android.nfc/enable_nfc_mainline_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.nfc"
-  name: "enable_nfc_mainline"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.nfc/enable_nfc_reader_option_flag_values.textproto b/aconfig/trunk_staging/android.nfc/enable_nfc_reader_option_flag_values.textproto
deleted file mode 100644
index ad6790ed..00000000
--- a/aconfig/trunk_staging/android.nfc/enable_nfc_reader_option_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.nfc"
-  name: "enable_nfc_reader_option"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.nfc/enable_nfc_set_discovery_tech_flag_values.textproto b/aconfig/trunk_staging/android.nfc/enable_nfc_set_discovery_tech_flag_values.textproto
deleted file mode 100644
index 5cef10b2..00000000
--- a/aconfig/trunk_staging/android.nfc/enable_nfc_set_discovery_tech_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.nfc"
-  name: "enable_nfc_set_discovery_tech"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.nfc/enable_nfc_user_restriction_flag_values.textproto b/aconfig/trunk_staging/android.nfc/enable_nfc_user_restriction_flag_values.textproto
deleted file mode 100644
index a2f83d66..00000000
--- a/aconfig/trunk_staging/android.nfc/enable_nfc_user_restriction_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.nfc"
-  name: "enable_nfc_user_restriction"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.nfc/nfc_action_manage_services_settings_flag_values.textproto b/aconfig/trunk_staging/android.nfc/nfc_action_manage_services_settings_flag_values.textproto
deleted file mode 100644
index 5906e7cc..00000000
--- a/aconfig/trunk_staging/android.nfc/nfc_action_manage_services_settings_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.nfc"
-  name: "nfc_action_manage_services_settings"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.nfc/nfc_apdu_service_info_constructor_flag_values.textproto b/aconfig/trunk_staging/android.nfc/nfc_apdu_service_info_constructor_flag_values.textproto
deleted file mode 100644
index 88f26ee0..00000000
--- a/aconfig/trunk_staging/android.nfc/nfc_apdu_service_info_constructor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.nfc"
-  name: "nfc_apdu_service_info_constructor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.nfc/nfc_associated_role_services_flag_values.textproto b/aconfig/trunk_staging/android.nfc/nfc_associated_role_services_flag_values.textproto
deleted file mode 100644
index a203a614..00000000
--- a/aconfig/trunk_staging/android.nfc/nfc_associated_role_services_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.nfc"
-  name: "nfc_associated_role_services"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.nfc/nfc_check_tag_intent_preference_flag_values.textproto b/aconfig/trunk_staging/android.nfc/nfc_check_tag_intent_preference_flag_values.textproto
deleted file mode 100644
index c9ed6b7d..00000000
--- a/aconfig/trunk_staging/android.nfc/nfc_check_tag_intent_preference_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.nfc"
-  name: "nfc_check_tag_intent_preference"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.nfc/nfc_event_listener_flag_values.textproto b/aconfig/trunk_staging/android.nfc/nfc_event_listener_flag_values.textproto
deleted file mode 100644
index c09ccd71..00000000
--- a/aconfig/trunk_staging/android.nfc/nfc_event_listener_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.nfc"
-  name: "nfc_event_listener"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.nfc/nfc_observe_mode_flag_values.textproto b/aconfig/trunk_staging/android.nfc/nfc_observe_mode_flag_values.textproto
deleted file mode 100644
index 58396c6e..00000000
--- a/aconfig/trunk_staging/android.nfc/nfc_observe_mode_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.nfc"
-  name: "nfc_observe_mode"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.nfc/nfc_observe_mode_st_shim_flag_values.textproto b/aconfig/trunk_staging/android.nfc/nfc_observe_mode_st_shim_flag_values.textproto
deleted file mode 100644
index 32e567c6..00000000
--- a/aconfig/trunk_staging/android.nfc/nfc_observe_mode_st_shim_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.nfc"
-  name: "nfc_observe_mode_st_shim"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.nfc/nfc_oem_extension_flag_values.textproto b/aconfig/trunk_staging/android.nfc/nfc_oem_extension_flag_values.textproto
deleted file mode 100644
index 4938b61a..00000000
--- a/aconfig/trunk_staging/android.nfc/nfc_oem_extension_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.nfc"
-  name: "nfc_oem_extension"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.nfc/nfc_override_recover_routing_table_flag_values.textproto b/aconfig/trunk_staging/android.nfc/nfc_override_recover_routing_table_flag_values.textproto
deleted file mode 100644
index df0fa16d..00000000
--- a/aconfig/trunk_staging/android.nfc/nfc_override_recover_routing_table_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.nfc"
-  name: "nfc_override_recover_routing_table"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.nfc/nfc_persist_log_flag_values.textproto b/aconfig/trunk_staging/android.nfc/nfc_persist_log_flag_values.textproto
deleted file mode 100644
index 22407409..00000000
--- a/aconfig/trunk_staging/android.nfc/nfc_persist_log_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.nfc"
-  name: "nfc_persist_log"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.nfc/nfc_read_polling_loop_flag_values.textproto b/aconfig/trunk_staging/android.nfc/nfc_read_polling_loop_flag_values.textproto
deleted file mode 100644
index ddbbc55b..00000000
--- a/aconfig/trunk_staging/android.nfc/nfc_read_polling_loop_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.nfc"
-  name: "nfc_read_polling_loop"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.nfc/nfc_read_polling_loop_st_shim_flag_values.textproto b/aconfig/trunk_staging/android.nfc/nfc_read_polling_loop_st_shim_flag_values.textproto
deleted file mode 100644
index 8917f6d3..00000000
--- a/aconfig/trunk_staging/android.nfc/nfc_read_polling_loop_st_shim_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.nfc"
-  name: "nfc_read_polling_loop_st_shim"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.nfc/nfc_set_default_disc_tech_flag_values.textproto b/aconfig/trunk_staging/android.nfc/nfc_set_default_disc_tech_flag_values.textproto
deleted file mode 100644
index 46803852..00000000
--- a/aconfig/trunk_staging/android.nfc/nfc_set_default_disc_tech_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.nfc"
-  name: "nfc_set_default_disc_tech"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.nfc/nfc_set_service_enabled_for_category_other_flag_values.textproto b/aconfig/trunk_staging/android.nfc/nfc_set_service_enabled_for_category_other_flag_values.textproto
deleted file mode 100644
index a25b6be2..00000000
--- a/aconfig/trunk_staging/android.nfc/nfc_set_service_enabled_for_category_other_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.nfc"
-  name: "nfc_set_service_enabled_for_category_other"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.nfc/nfc_state_change_flag_values.textproto b/aconfig/trunk_staging/android.nfc/nfc_state_change_flag_values.textproto
deleted file mode 100644
index 6bd053a4..00000000
--- a/aconfig/trunk_staging/android.nfc/nfc_state_change_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.nfc"
-  name: "nfc_state_change"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.nfc/nfc_state_change_security_log_event_enabled_flag_values.textproto b/aconfig/trunk_staging/android.nfc/nfc_state_change_security_log_event_enabled_flag_values.textproto
deleted file mode 100644
index 0035134e..00000000
--- a/aconfig/trunk_staging/android.nfc/nfc_state_change_security_log_event_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.nfc"
-  name: "nfc_state_change_security_log_event_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.nfc/nfc_vendor_cmd_flag_values.textproto b/aconfig/trunk_staging/android.nfc/nfc_vendor_cmd_flag_values.textproto
deleted file mode 100644
index 765856b2..00000000
--- a/aconfig/trunk_staging/android.nfc/nfc_vendor_cmd_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.nfc"
-  name: "nfc_vendor_cmd"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.nfc/nfc_watchdog_flag_values.textproto b/aconfig/trunk_staging/android.nfc/nfc_watchdog_flag_values.textproto
deleted file mode 100644
index f67036f9..00000000
--- a/aconfig/trunk_staging/android.nfc/nfc_watchdog_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.nfc"
-  name: "nfc_watchdog"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os.profiling/Android.bp b/aconfig/trunk_staging/android.os.profiling/Android.bp
deleted file mode 100644
index 821571e9..00000000
--- a/aconfig/trunk_staging/android.os.profiling/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.os.profiling-all",
-    package: "android.os.profiling",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.os.profiling/persist_queue_flag_values.textproto b/aconfig/trunk_staging/android.os.profiling/persist_queue_flag_values.textproto
deleted file mode 100644
index df6170f4..00000000
--- a/aconfig/trunk_staging/android.os.profiling/persist_queue_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.profiling"
-  name: "persist_queue"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os.profiling/redaction_enabled_flag_values.textproto b/aconfig/trunk_staging/android.os.profiling/redaction_enabled_flag_values.textproto
deleted file mode 100644
index c8ac4d0a..00000000
--- a/aconfig/trunk_staging/android.os.profiling/redaction_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.profiling"
-  name: "redaction_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os.profiling/system_triggered_profiling_flag_values.textproto b/aconfig/trunk_staging/android.os.profiling/system_triggered_profiling_flag_values.textproto
deleted file mode 100644
index 1d993ece..00000000
--- a/aconfig/trunk_staging/android.os.profiling/system_triggered_profiling_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.profiling"
-  name: "system_triggered_profiling"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os.profiling/system_triggered_profiling_new_flag_values.textproto b/aconfig/trunk_staging/android.os.profiling/system_triggered_profiling_new_flag_values.textproto
deleted file mode 100644
index fcc11432..00000000
--- a/aconfig/trunk_staging/android.os.profiling/system_triggered_profiling_new_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.profiling"
-  name: "system_triggered_profiling_new"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.os.profiling/telemetry_apis_flag_values.textproto b/aconfig/trunk_staging/android.os.profiling/telemetry_apis_flag_values.textproto
deleted file mode 100644
index 0ac6785b..00000000
--- a/aconfig/trunk_staging/android.os.profiling/telemetry_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.profiling"
-  name: "telemetry_apis"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.os.vibrator/Android.bp b/aconfig/trunk_staging/android.os.vibrator/Android.bp
deleted file mode 100644
index bd328c62..00000000
--- a/aconfig/trunk_staging/android.os.vibrator/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.os.vibrator-all",
-    package: "android.os.vibrator",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.os.vibrator/adaptive_haptics_enabled_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/adaptive_haptics_enabled_flag_values.textproto
deleted file mode 100644
index 3384360d..00000000
--- a/aconfig/trunk_staging/android.os.vibrator/adaptive_haptics_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.vibrator"
-  name: "adaptive_haptics_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os.vibrator/cancel_by_appops_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/cancel_by_appops_flag_values.textproto
deleted file mode 100644
index f168ce36..00000000
--- a/aconfig/trunk_staging/android.os.vibrator/cancel_by_appops_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.vibrator"
-  name: "cancel_by_appops"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.os.vibrator/fix_audio_coupled_haptics_scaling_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/fix_audio_coupled_haptics_scaling_flag_values.textproto
deleted file mode 100644
index d863e433..00000000
--- a/aconfig/trunk_staging/android.os.vibrator/fix_audio_coupled_haptics_scaling_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.vibrator"
-  name: "fix_audio_coupled_haptics_scaling"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os.vibrator/fix_external_vibration_system_update_aware_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/fix_external_vibration_system_update_aware_flag_values.textproto
deleted file mode 100644
index 7af6aa48..00000000
--- a/aconfig/trunk_staging/android.os.vibrator/fix_external_vibration_system_update_aware_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.vibrator"
-  name: "fix_external_vibration_system_update_aware"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os.vibrator/fix_vibration_thread_callback_handling_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/fix_vibration_thread_callback_handling_flag_values.textproto
deleted file mode 100644
index 70d8b22e..00000000
--- a/aconfig/trunk_staging/android.os.vibrator/fix_vibration_thread_callback_handling_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.vibrator"
-  name: "fix_vibration_thread_callback_handling"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os.vibrator/haptic_feedback_input_source_customization_enabled_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/haptic_feedback_input_source_customization_enabled_flag_values.textproto
deleted file mode 100644
index e500b6a3..00000000
--- a/aconfig/trunk_staging/android.os.vibrator/haptic_feedback_input_source_customization_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.vibrator"
-  name: "haptic_feedback_input_source_customization_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.os.vibrator/haptic_feedback_vibration_oem_customization_enabled_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/haptic_feedback_vibration_oem_customization_enabled_flag_values.textproto
deleted file mode 100644
index 07b2454f..00000000
--- a/aconfig/trunk_staging/android.os.vibrator/haptic_feedback_vibration_oem_customization_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.vibrator"
-  name: "haptic_feedback_vibration_oem_customization_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.os.vibrator/haptics_scale_v2_enabled_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/haptics_scale_v2_enabled_flag_values.textproto
deleted file mode 100644
index a959a886..00000000
--- a/aconfig/trunk_staging/android.os.vibrator/haptics_scale_v2_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.vibrator"
-  name: "haptics_scale_v2_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os.vibrator/keyboard_category_enabled_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/keyboard_category_enabled_flag_values.textproto
deleted file mode 100644
index 29b12be4..00000000
--- a/aconfig/trunk_staging/android.os.vibrator/keyboard_category_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.vibrator"
-  name: "keyboard_category_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os.vibrator/load_haptic_feedback_vibration_customization_from_resources_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/load_haptic_feedback_vibration_customization_from_resources_flag_values.textproto
deleted file mode 100644
index bc7f1e5c..00000000
--- a/aconfig/trunk_staging/android.os.vibrator/load_haptic_feedback_vibration_customization_from_resources_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.vibrator"
-  name: "load_haptic_feedback_vibration_customization_from_resources"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.os.vibrator/normalized_pwle_effects_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/normalized_pwle_effects_flag_values.textproto
deleted file mode 100644
index 0b74becf..00000000
--- a/aconfig/trunk_staging/android.os.vibrator/normalized_pwle_effects_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.vibrator"
-  name: "normalized_pwle_effects"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os.vibrator/primitive_composition_absolute_delay_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/primitive_composition_absolute_delay_flag_values.textproto
deleted file mode 100644
index ba2b9a02..00000000
--- a/aconfig/trunk_staging/android.os.vibrator/primitive_composition_absolute_delay_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.vibrator"
-  name: "primitive_composition_absolute_delay"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os.vibrator/remove_hidl_support_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/remove_hidl_support_flag_values.textproto
deleted file mode 100644
index 71d426bf..00000000
--- a/aconfig/trunk_staging/android.os.vibrator/remove_hidl_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.vibrator"
-  name: "remove_hidl_support"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.os.vibrator/throttle_vibration_params_requests_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/throttle_vibration_params_requests_flag_values.textproto
deleted file mode 100644
index ec47997b..00000000
--- a/aconfig/trunk_staging/android.os.vibrator/throttle_vibration_params_requests_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.vibrator"
-  name: "throttle_vibration_params_requests"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os.vibrator/use_vibrator_haptic_feedback_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/use_vibrator_haptic_feedback_flag_values.textproto
deleted file mode 100644
index ed2358eb..00000000
--- a/aconfig/trunk_staging/android.os.vibrator/use_vibrator_haptic_feedback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.vibrator"
-  name: "use_vibrator_haptic_feedback"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os.vibrator/vendor_vibration_effects_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/vendor_vibration_effects_flag_values.textproto
deleted file mode 100644
index e3f9751a..00000000
--- a/aconfig/trunk_staging/android.os.vibrator/vendor_vibration_effects_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.vibrator"
-  name: "vendor_vibration_effects"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os.vibrator/vibration_pipeline_enabled_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/vibration_pipeline_enabled_flag_values.textproto
deleted file mode 100644
index 36dee205..00000000
--- a/aconfig/trunk_staging/android.os.vibrator/vibration_pipeline_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.vibrator"
-  name: "vibration_pipeline_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os.vibrator/vibration_xml_apis_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/vibration_xml_apis_flag_values.textproto
deleted file mode 100644
index 5ece451e..00000000
--- a/aconfig/trunk_staging/android.os.vibrator/vibration_xml_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.vibrator"
-  name: "vibration_xml_apis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/Android.bp b/aconfig/trunk_staging/android.os/Android.bp
deleted file mode 100644
index ec0b4761..00000000
--- a/aconfig/trunk_staging/android.os/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.os-all",
-    package: "android.os",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.os/adpf_fmq_eager_send_flag_values.textproto b/aconfig/trunk_staging/android.os/adpf_fmq_eager_send_flag_values.textproto
deleted file mode 100644
index cf1804d9..00000000
--- a/aconfig/trunk_staging/android.os/adpf_fmq_eager_send_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "adpf_fmq_eager_send"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.os/adpf_gpu_report_actual_work_duration_flag_values.textproto b/aconfig/trunk_staging/android.os/adpf_gpu_report_actual_work_duration_flag_values.textproto
deleted file mode 100644
index fcdf72fc..00000000
--- a/aconfig/trunk_staging/android.os/adpf_gpu_report_actual_work_duration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "adpf_gpu_report_actual_work_duration"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/adpf_graphics_pipeline_flag_values.textproto b/aconfig/trunk_staging/android.os/adpf_graphics_pipeline_flag_values.textproto
deleted file mode 100644
index 9ac97a74..00000000
--- a/aconfig/trunk_staging/android.os/adpf_graphics_pipeline_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "adpf_graphics_pipeline"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.os/adpf_hwui_gpu_flag_values.textproto b/aconfig/trunk_staging/android.os/adpf_hwui_gpu_flag_values.textproto
deleted file mode 100644
index d4e17ff1..00000000
--- a/aconfig/trunk_staging/android.os/adpf_hwui_gpu_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "adpf_hwui_gpu"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.os/adpf_obtainview_boost_flag_values.textproto b/aconfig/trunk_staging/android.os/adpf_obtainview_boost_flag_values.textproto
deleted file mode 100644
index 5a1d092a..00000000
--- a/aconfig/trunk_staging/android.os/adpf_obtainview_boost_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "adpf_obtainview_boost"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.os/adpf_prefer_power_efficiency_flag_values.textproto b/aconfig/trunk_staging/android.os/adpf_prefer_power_efficiency_flag_values.textproto
deleted file mode 100644
index f5c13f22..00000000
--- a/aconfig/trunk_staging/android.os/adpf_prefer_power_efficiency_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "adpf_prefer_power_efficiency"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/adpf_use_fmq_channel_fixed_flag_values.textproto b/aconfig/trunk_staging/android.os/adpf_use_fmq_channel_fixed_flag_values.textproto
deleted file mode 100644
index 2775bbf0..00000000
--- a/aconfig/trunk_staging/android.os/adpf_use_fmq_channel_fixed_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "adpf_use_fmq_channel_fixed"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.os/adpf_use_fmq_channel_flag_values.textproto b/aconfig/trunk_staging/android.os/adpf_use_fmq_channel_flag_values.textproto
deleted file mode 100644
index a6c31e8a..00000000
--- a/aconfig/trunk_staging/android.os/adpf_use_fmq_channel_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "adpf_use_fmq_channel"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/adpf_use_load_hints_flag_values.textproto b/aconfig/trunk_staging/android.os/adpf_use_load_hints_flag_values.textproto
deleted file mode 100644
index 0bbbed63..00000000
--- a/aconfig/trunk_staging/android.os/adpf_use_load_hints_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "adpf_use_load_hints"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.os/allow_private_profile_flag_values.textproto b/aconfig/trunk_staging/android.os/allow_private_profile_flag_values.textproto
deleted file mode 100644
index a2497701..00000000
--- a/aconfig/trunk_staging/android.os/allow_private_profile_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "allow_private_profile"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/allow_thermal_hal_skin_forecast_flag_values.textproto b/aconfig/trunk_staging/android.os/allow_thermal_hal_skin_forecast_flag_values.textproto
deleted file mode 100644
index fd20ab06..00000000
--- a/aconfig/trunk_staging/android.os/allow_thermal_hal_skin_forecast_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "allow_thermal_hal_skin_forecast"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/allow_thermal_headroom_thresholds_flag_values.textproto b/aconfig/trunk_staging/android.os/allow_thermal_headroom_thresholds_flag_values.textproto
deleted file mode 100644
index 38754136..00000000
--- a/aconfig/trunk_staging/android.os/allow_thermal_headroom_thresholds_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "allow_thermal_headroom_thresholds"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/allow_thermal_thresholds_callback_flag_values.textproto b/aconfig/trunk_staging/android.os/allow_thermal_thresholds_callback_flag_values.textproto
deleted file mode 100644
index f2375b5d..00000000
--- a/aconfig/trunk_staging/android.os/allow_thermal_thresholds_callback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "allow_thermal_thresholds_callback"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/android_os_build_vanilla_ice_cream_flag_values.textproto b/aconfig/trunk_staging/android.os/android_os_build_vanilla_ice_cream_flag_values.textproto
deleted file mode 100644
index 3bee742c..00000000
--- a/aconfig/trunk_staging/android.os/android_os_build_vanilla_ice_cream_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "android_os_build_vanilla_ice_cream"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/api_for_backported_fixes_flag_values.textproto b/aconfig/trunk_staging/android.os/api_for_backported_fixes_flag_values.textproto
deleted file mode 100644
index 0ec70876..00000000
--- a/aconfig/trunk_staging/android.os/api_for_backported_fixes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "api_for_backported_fixes"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/app_zygote_retry_start_flag_values.textproto b/aconfig/trunk_staging/android.os/app_zygote_retry_start_flag_values.textproto
deleted file mode 100644
index 7f900a48..00000000
--- a/aconfig/trunk_staging/android.os/app_zygote_retry_start_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "app_zygote_retry_start"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/battery_part_status_api_flag_values.textproto b/aconfig/trunk_staging/android.os/battery_part_status_api_flag_values.textproto
deleted file mode 100644
index 24d61100..00000000
--- a/aconfig/trunk_staging/android.os/battery_part_status_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "battery_part_status_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.os/battery_saver_supported_check_api_flag_values.textproto b/aconfig/trunk_staging/android.os/battery_saver_supported_check_api_flag_values.textproto
deleted file mode 100644
index 599d4c4f..00000000
--- a/aconfig/trunk_staging/android.os/battery_saver_supported_check_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "battery_saver_supported_check_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/battery_service_support_current_adb_command_flag_values.textproto b/aconfig/trunk_staging/android.os/battery_service_support_current_adb_command_flag_values.textproto
deleted file mode 100644
index 42028d0f..00000000
--- a/aconfig/trunk_staging/android.os/battery_service_support_current_adb_command_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "battery_service_support_current_adb_command"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.os/binder_frozen_state_change_callback_flag_values.textproto b/aconfig/trunk_staging/android.os/binder_frozen_state_change_callback_flag_values.textproto
deleted file mode 100644
index 8816d8a7..00000000
--- a/aconfig/trunk_staging/android.os/binder_frozen_state_change_callback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "binder_frozen_state_change_callback"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/bugreport_mode_max_value_flag_values.textproto b/aconfig/trunk_staging/android.os/bugreport_mode_max_value_flag_values.textproto
deleted file mode 100644
index 094b7f93..00000000
--- a/aconfig/trunk_staging/android.os/bugreport_mode_max_value_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "bugreport_mode_max_value"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/cpu_gpu_headrooms_flag_values.textproto b/aconfig/trunk_staging/android.os/cpu_gpu_headrooms_flag_values.textproto
deleted file mode 100644
index fd2a44e2..00000000
--- a/aconfig/trunk_staging/android.os/cpu_gpu_headrooms_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "cpu_gpu_headrooms"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/disable_madvise_artfile_default_flag_values.textproto b/aconfig/trunk_staging/android.os/disable_madvise_artfile_default_flag_values.textproto
deleted file mode 100644
index f642c311..00000000
--- a/aconfig/trunk_staging/android.os/disable_madvise_artfile_default_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "disable_madvise_artfile_default"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/disallow_cellular_null_ciphers_restriction_flag_values.textproto b/aconfig/trunk_staging/android.os/disallow_cellular_null_ciphers_restriction_flag_values.textproto
deleted file mode 100644
index 170968b0..00000000
--- a/aconfig/trunk_staging/android.os/disallow_cellular_null_ciphers_restriction_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "disallow_cellular_null_ciphers_restriction"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/enable_angle_allow_list_flag_values.textproto b/aconfig/trunk_staging/android.os/enable_angle_allow_list_flag_values.textproto
deleted file mode 100644
index 596587a1..00000000
--- a/aconfig/trunk_staging/android.os/enable_angle_allow_list_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "enable_angle_allow_list"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.os/enable_has_binders_flag_values.textproto b/aconfig/trunk_staging/android.os/enable_has_binders_flag_values.textproto
deleted file mode 100644
index b6bfded8..00000000
--- a/aconfig/trunk_staging/android.os/enable_has_binders_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "enable_has_binders"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.os/get_private_space_settings_flag_values.textproto b/aconfig/trunk_staging/android.os/get_private_space_settings_flag_values.textproto
deleted file mode 100644
index eab7d526..00000000
--- a/aconfig/trunk_staging/android.os/get_private_space_settings_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "get_private_space_settings"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/mainline_vcn_platform_api_flag_values.textproto b/aconfig/trunk_staging/android.os/mainline_vcn_platform_api_flag_values.textproto
deleted file mode 100644
index 7abdb9f5..00000000
--- a/aconfig/trunk_staging/android.os/mainline_vcn_platform_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "mainline_vcn_platform_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/material_motion_tokens_flag_values.textproto b/aconfig/trunk_staging/android.os/material_motion_tokens_flag_values.textproto
deleted file mode 100644
index ffef8773..00000000
--- a/aconfig/trunk_staging/android.os/material_motion_tokens_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "material_motion_tokens"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/material_shape_tokens_flag_values.textproto b/aconfig/trunk_staging/android.os/material_shape_tokens_flag_values.textproto
deleted file mode 100644
index f3c17079..00000000
--- a/aconfig/trunk_staging/android.os/material_shape_tokens_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "material_shape_tokens"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/message_queue_force_legacy_flag_values.textproto b/aconfig/trunk_staging/android.os/message_queue_force_legacy_flag_values.textproto
deleted file mode 100644
index ab448299..00000000
--- a/aconfig/trunk_staging/android.os/message_queue_force_legacy_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "message_queue_force_legacy"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/message_queue_tail_tracking_flag_values.textproto b/aconfig/trunk_staging/android.os/message_queue_tail_tracking_flag_values.textproto
deleted file mode 100644
index 74ba36df..00000000
--- a/aconfig/trunk_staging/android.os/message_queue_tail_tracking_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "message_queue_tail_tracking"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.os/message_queue_testability_flag_values.textproto b/aconfig/trunk_staging/android.os/message_queue_testability_flag_values.textproto
deleted file mode 100644
index bc712118..00000000
--- a/aconfig/trunk_staging/android.os/message_queue_testability_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "message_queue_testability"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.os/network_time_uses_shared_memory_flag_values.textproto b/aconfig/trunk_staging/android.os/network_time_uses_shared_memory_flag_values.textproto
deleted file mode 100644
index 4c28c9f9..00000000
--- a/aconfig/trunk_staging/android.os/network_time_uses_shared_memory_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "network_time_uses_shared_memory"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/ordered_broadcast_multiple_permissions_flag_values.textproto b/aconfig/trunk_staging/android.os/ordered_broadcast_multiple_permissions_flag_values.textproto
deleted file mode 100644
index 097892dd..00000000
--- a/aconfig/trunk_staging/android.os/ordered_broadcast_multiple_permissions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "ordered_broadcast_multiple_permissions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/parcel_marshall_bytebuffer_flag_values.textproto b/aconfig/trunk_staging/android.os/parcel_marshall_bytebuffer_flag_values.textproto
deleted file mode 100644
index f3c5e91c..00000000
--- a/aconfig/trunk_staging/android.os/parcel_marshall_bytebuffer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "parcel_marshall_bytebuffer"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.os/perfetto_sdk_tracing_flag_values.textproto b/aconfig/trunk_staging/android.os/perfetto_sdk_tracing_flag_values.textproto
deleted file mode 100644
index 70119d89..00000000
--- a/aconfig/trunk_staging/android.os/perfetto_sdk_tracing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "perfetto_sdk_tracing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/perfetto_sdk_tracing_v2_flag_values.textproto b/aconfig/trunk_staging/android.os/perfetto_sdk_tracing_v2_flag_values.textproto
deleted file mode 100644
index 8c6ef649..00000000
--- a/aconfig/trunk_staging/android.os/perfetto_sdk_tracing_v2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "perfetto_sdk_tracing_v2"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/remove_app_profiler_pss_collection_flag_values.textproto b/aconfig/trunk_staging/android.os/remove_app_profiler_pss_collection_flag_values.textproto
deleted file mode 100644
index f2801195..00000000
--- a/aconfig/trunk_staging/android.os/remove_app_profiler_pss_collection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "remove_app_profiler_pss_collection"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/security_state_service_flag_values.textproto b/aconfig/trunk_staging/android.os/security_state_service_flag_values.textproto
deleted file mode 100644
index c2407f17..00000000
--- a/aconfig/trunk_staging/android.os/security_state_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "security_state_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/state_of_health_public_flag_values.textproto b/aconfig/trunk_staging/android.os/state_of_health_public_flag_values.textproto
deleted file mode 100644
index b8adffe0..00000000
--- a/aconfig/trunk_staging/android.os/state_of_health_public_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "state_of_health_public"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/storage_lifetime_api_flag_values.textproto b/aconfig/trunk_staging/android.os/storage_lifetime_api_flag_values.textproto
deleted file mode 100644
index 9dca99ae..00000000
--- a/aconfig/trunk_staging/android.os/storage_lifetime_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "storage_lifetime_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.os/telemetry_apis_framework_initialization_flag_values.textproto b/aconfig/trunk_staging/android.os/telemetry_apis_framework_initialization_flag_values.textproto
deleted file mode 100644
index b923e341..00000000
--- a/aconfig/trunk_staging/android.os/telemetry_apis_framework_initialization_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "telemetry_apis_framework_initialization"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.os/update_engine_api_flag_values.textproto b/aconfig/trunk_staging/android.os/update_engine_api_flag_values.textproto
deleted file mode 100644
index 876410a2..00000000
--- a/aconfig/trunk_staging/android.os/update_engine_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "update_engine_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/Android.bp b/aconfig/trunk_staging/android.permission.flags/Android.bp
deleted file mode 100644
index ff9803fb..00000000
--- a/aconfig/trunk_staging/android.permission.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.permission.flags-all",
-    package: "android.permission.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/allow_host_permission_dialogs_on_virtual_devices_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/allow_host_permission_dialogs_on_virtual_devices_flag_values.textproto
deleted file mode 100644
index fa281a96..00000000
--- a/aconfig/trunk_staging/android.permission.flags/allow_host_permission_dialogs_on_virtual_devices_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "allow_host_permission_dialogs_on_virtual_devices"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/apex_signature_permission_allowlist_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/apex_signature_permission_allowlist_enabled_flag_values.textproto
deleted file mode 100644
index b11f3dfb..00000000
--- a/aconfig/trunk_staging/android.permission.flags/apex_signature_permission_allowlist_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "apex_signature_permission_allowlist_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/app_ops_service_handler_fix_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/app_ops_service_handler_fix_flag_values.textproto
deleted file mode 100644
index ffdba94a..00000000
--- a/aconfig/trunk_staging/android.permission.flags/app_ops_service_handler_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "app_ops_service_handler_fix"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/appop_access_tracking_logging_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/appop_access_tracking_logging_enabled_flag_values.textproto
deleted file mode 100644
index 05ca886c..00000000
--- a/aconfig/trunk_staging/android.permission.flags/appop_access_tracking_logging_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "appop_access_tracking_logging_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/appop_mode_caching_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/appop_mode_caching_enabled_flag_values.textproto
deleted file mode 100644
index 2a9dd93c..00000000
--- a/aconfig/trunk_staging/android.permission.flags/appop_mode_caching_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "appop_mode_caching_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/check_op_overload_api_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/check_op_overload_api_enabled_flag_values.textproto
deleted file mode 100644
index 86438382..00000000
--- a/aconfig/trunk_staging/android.permission.flags/check_op_overload_api_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "check_op_overload_api_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/check_op_validate_package_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/check_op_validate_package_flag_values.textproto
deleted file mode 100644
index 3a2b3a9b..00000000
--- a/aconfig/trunk_staging/android.permission.flags/check_op_validate_package_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "check_op_validate_package"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/delay_uid_state_changes_from_capability_updates_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/delay_uid_state_changes_from_capability_updates_flag_values.textproto
deleted file mode 100644
index 88c065ed..00000000
--- a/aconfig/trunk_staging/android.permission.flags/delay_uid_state_changes_from_capability_updates_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "delay_uid_state_changes_from_capability_updates"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/device_aware_permission_apis_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/device_aware_permission_apis_enabled_flag_values.textproto
deleted file mode 100644
index 85f984ff..00000000
--- a/aconfig/trunk_staging/android.permission.flags/device_aware_permission_apis_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "device_aware_permission_apis_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/device_aware_permissions_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/device_aware_permissions_enabled_flag_values.textproto
deleted file mode 100644
index cd7276e6..00000000
--- a/aconfig/trunk_staging/android.permission.flags/device_aware_permissions_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "device_aware_permissions_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/device_id_in_op_proxy_info_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/device_id_in_op_proxy_info_enabled_flag_values.textproto
deleted file mode 100644
index b11095db..00000000
--- a/aconfig/trunk_staging/android.permission.flags/device_id_in_op_proxy_info_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "device_id_in_op_proxy_info_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/device_policy_management_role_split_create_managed_profile_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/device_policy_management_role_split_create_managed_profile_enabled_flag_values.textproto
deleted file mode 100644
index 4c1a5f5d..00000000
--- a/aconfig/trunk_staging/android.permission.flags/device_policy_management_role_split_create_managed_profile_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "device_policy_management_role_split_create_managed_profile_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/dont_remove_existing_uid_states_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/dont_remove_existing_uid_states_flag_values.textproto
deleted file mode 100644
index 2a72f614..00000000
--- a/aconfig/trunk_staging/android.permission.flags/dont_remove_existing_uid_states_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "dont_remove_existing_uid_states"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/enable_aiai_proxied_text_classifiers_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/enable_aiai_proxied_text_classifiers_flag_values.textproto
deleted file mode 100644
index 7d3c0a98..00000000
--- a/aconfig/trunk_staging/android.permission.flags/enable_aiai_proxied_text_classifiers_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "enable_aiai_proxied_text_classifiers"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/enable_otp_in_text_classifiers_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/enable_otp_in_text_classifiers_flag_values.textproto
deleted file mode 100644
index ae506e11..00000000
--- a/aconfig/trunk_staging/android.permission.flags/enable_otp_in_text_classifiers_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "enable_otp_in_text_classifiers"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/enable_sqlite_appops_accesses_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/enable_sqlite_appops_accesses_flag_values.textproto
deleted file mode 100644
index d6504caf..00000000
--- a/aconfig/trunk_staging/android.permission.flags/enable_sqlite_appops_accesses_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "enable_sqlite_appops_accesses"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/enforce_default_device_id_in_my_attribution_source_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/enforce_default_device_id_in_my_attribution_source_flag_values.textproto
deleted file mode 100644
index e4705759..00000000
--- a/aconfig/trunk_staging/android.permission.flags/enforce_default_device_id_in_my_attribution_source_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "enforce_default_device_id_in_my_attribution_source"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/enhanced_confirmation_in_call_apis_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/enhanced_confirmation_in_call_apis_enabled_flag_values.textproto
deleted file mode 100644
index a1fa494e..00000000
--- a/aconfig/trunk_staging/android.permission.flags/enhanced_confirmation_in_call_apis_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "enhanced_confirmation_in_call_apis_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/enhanced_confirmation_mode_apis_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/enhanced_confirmation_mode_apis_enabled_flag_values.textproto
deleted file mode 100644
index c3d5a4ac..00000000
--- a/aconfig/trunk_staging/android.permission.flags/enhanced_confirmation_mode_apis_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "enhanced_confirmation_mode_apis_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/factory_reset_prep_permission_apis_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/factory_reset_prep_permission_apis_flag_values.textproto
deleted file mode 100644
index 6c5035e9..00000000
--- a/aconfig/trunk_staging/android.permission.flags/factory_reset_prep_permission_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "factory_reset_prep_permission_apis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/fine_power_monitor_permission_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/fine_power_monitor_permission_flag_values.textproto
deleted file mode 100644
index ad26655f..00000000
--- a/aconfig/trunk_staging/android.permission.flags/fine_power_monitor_permission_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "fine_power_monitor_permission"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/finish_running_ops_for_killed_packages_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/finish_running_ops_for_killed_packages_flag_values.textproto
deleted file mode 100644
index fd230f38..00000000
--- a/aconfig/trunk_staging/android.permission.flags/finish_running_ops_for_killed_packages_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "finish_running_ops_for_killed_packages"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/get_emergency_role_holder_api_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/get_emergency_role_holder_api_enabled_flag_values.textproto
deleted file mode 100644
index e5802cbe..00000000
--- a/aconfig/trunk_staging/android.permission.flags/get_emergency_role_holder_api_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "get_emergency_role_holder_api_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/grant_read_blocked_numbers_to_system_ui_intelligence_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/grant_read_blocked_numbers_to_system_ui_intelligence_flag_values.textproto
deleted file mode 100644
index e98cff11..00000000
--- a/aconfig/trunk_staging/android.permission.flags/grant_read_blocked_numbers_to_system_ui_intelligence_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "grant_read_blocked_numbers_to_system_ui_intelligence"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/health_connect_backup_restore_permission_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/health_connect_backup_restore_permission_enabled_flag_values.textproto
deleted file mode 100644
index 3ed2c015..00000000
--- a/aconfig/trunk_staging/android.permission.flags/health_connect_backup_restore_permission_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "health_connect_backup_restore_permission_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/location_bypass_privacy_dashboard_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/location_bypass_privacy_dashboard_enabled_flag_values.textproto
deleted file mode 100644
index 171f918d..00000000
--- a/aconfig/trunk_staging/android.permission.flags/location_bypass_privacy_dashboard_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "location_bypass_privacy_dashboard_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/note_op_batching_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/note_op_batching_enabled_flag_values.textproto
deleted file mode 100644
index f1fdae14..00000000
--- a/aconfig/trunk_staging/android.permission.flags/note_op_batching_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "note_op_batching_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/op_enable_mobile_data_by_user_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/op_enable_mobile_data_by_user_flag_values.textproto
deleted file mode 100644
index 4739cf27..00000000
--- a/aconfig/trunk_staging/android.permission.flags/op_enable_mobile_data_by_user_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "op_enable_mobile_data_by_user"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/permission_request_short_circuit_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/permission_request_short_circuit_enabled_flag_values.textproto
deleted file mode 100644
index b0ccac54..00000000
--- a/aconfig/trunk_staging/android.permission.flags/permission_request_short_circuit_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "permission_request_short_circuit_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/permission_tree_apis_deprecated_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/permission_tree_apis_deprecated_flag_values.textproto
deleted file mode 100644
index f9a40b12..00000000
--- a/aconfig/trunk_staging/android.permission.flags/permission_tree_apis_deprecated_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "permission_tree_apis_deprecated"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/ranging_permission_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/ranging_permission_enabled_flag_values.textproto
deleted file mode 100644
index ede3c758..00000000
--- a/aconfig/trunk_staging/android.permission.flags/ranging_permission_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "ranging_permission_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/rate_limit_batched_note_op_async_callbacks_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/rate_limit_batched_note_op_async_callbacks_enabled_flag_values.textproto
deleted file mode 100644
index 5f699e17..00000000
--- a/aconfig/trunk_staging/android.permission.flags/rate_limit_batched_note_op_async_callbacks_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "rate_limit_batched_note_op_async_callbacks_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/record_all_runtime_appops_sqlite_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/record_all_runtime_appops_sqlite_flag_values.textproto
deleted file mode 100644
index d6280f40..00000000
--- a/aconfig/trunk_staging/android.permission.flags/record_all_runtime_appops_sqlite_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "record_all_runtime_appops_sqlite"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/replace_body_sensor_permission_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/replace_body_sensor_permission_enabled_flag_values.textproto
deleted file mode 100644
index ce138cdb..00000000
--- a/aconfig/trunk_staging/android.permission.flags/replace_body_sensor_permission_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "replace_body_sensor_permission_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/retail_demo_role_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/retail_demo_role_enabled_flag_values.textproto
deleted file mode 100644
index d74ce62e..00000000
--- a/aconfig/trunk_staging/android.permission.flags/retail_demo_role_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "retail_demo_role_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/runtime_permission_appops_mapping_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/runtime_permission_appops_mapping_enabled_flag_values.textproto
deleted file mode 100644
index 83217147..00000000
--- a/aconfig/trunk_staging/android.permission.flags/runtime_permission_appops_mapping_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "runtime_permission_appops_mapping_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/sensitive_content_improvements_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/sensitive_content_improvements_flag_values.textproto
deleted file mode 100644
index c88be813..00000000
--- a/aconfig/trunk_staging/android.permission.flags/sensitive_content_improvements_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "sensitive_content_improvements"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/sensitive_content_metrics_bugfix_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/sensitive_content_metrics_bugfix_flag_values.textproto
deleted file mode 100644
index bc5cd6aa..00000000
--- a/aconfig/trunk_staging/android.permission.flags/sensitive_content_metrics_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "sensitive_content_metrics_bugfix"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/sensitive_content_recents_screenshot_bugfix_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/sensitive_content_recents_screenshot_bugfix_flag_values.textproto
deleted file mode 100644
index dea1f11e..00000000
--- a/aconfig/trunk_staging/android.permission.flags/sensitive_content_recents_screenshot_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "sensitive_content_recents_screenshot_bugfix"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/sensitive_notification_app_protection_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/sensitive_notification_app_protection_flag_values.textproto
deleted file mode 100644
index 1bfcdfb9..00000000
--- a/aconfig/trunk_staging/android.permission.flags/sensitive_notification_app_protection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "sensitive_notification_app_protection"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/server_side_attribution_registration_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/server_side_attribution_registration_flag_values.textproto
deleted file mode 100644
index 75285d2d..00000000
--- a/aconfig/trunk_staging/android.permission.flags/server_side_attribution_registration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "server_side_attribution_registration"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/set_next_attribution_source_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/set_next_attribution_source_flag_values.textproto
deleted file mode 100644
index 9957bd72..00000000
--- a/aconfig/trunk_staging/android.permission.flags/set_next_attribution_source_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "set_next_attribution_source"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/should_register_attribution_source_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/should_register_attribution_source_flag_values.textproto
deleted file mode 100644
index 09e37906..00000000
--- a/aconfig/trunk_staging/android.permission.flags/should_register_attribution_source_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "should_register_attribution_source"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/signature_permission_allowlist_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/signature_permission_allowlist_enabled_flag_values.textproto
deleted file mode 100644
index 87fda097..00000000
--- a/aconfig/trunk_staging/android.permission.flags/signature_permission_allowlist_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "signature_permission_allowlist_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/sqlite_discrete_op_event_logging_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/sqlite_discrete_op_event_logging_enabled_flag_values.textproto
deleted file mode 100644
index 805df59c..00000000
--- a/aconfig/trunk_staging/android.permission.flags/sqlite_discrete_op_event_logging_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "sqlite_discrete_op_event_logging_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/supervision_role_permission_update_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/supervision_role_permission_update_enabled_flag_values.textproto
deleted file mode 100644
index 54537a02..00000000
--- a/aconfig/trunk_staging/android.permission.flags/supervision_role_permission_update_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "supervision_role_permission_update_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/sync_on_op_noted_api_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/sync_on_op_noted_api_flag_values.textproto
deleted file mode 100644
index 7f0f96c8..00000000
--- a/aconfig/trunk_staging/android.permission.flags/sync_on_op_noted_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "sync_on_op_noted_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/system_server_role_controller_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/system_server_role_controller_enabled_flag_values.textproto
deleted file mode 100644
index 19a882e7..00000000
--- a/aconfig/trunk_staging/android.permission.flags/system_server_role_controller_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "system_server_role_controller_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/system_vendor_intelligence_role_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/system_vendor_intelligence_role_enabled_flag_values.textproto
deleted file mode 100644
index 39a8eb96..00000000
--- a/aconfig/trunk_staging/android.permission.flags/system_vendor_intelligence_role_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "system_vendor_intelligence_role_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/text_classifier_choice_api_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/text_classifier_choice_api_enabled_flag_values.textproto
deleted file mode 100644
index b2d9013d..00000000
--- a/aconfig/trunk_staging/android.permission.flags/text_classifier_choice_api_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "text_classifier_choice_api_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/unknown_call_package_install_blocking_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/unknown_call_package_install_blocking_enabled_flag_values.textproto
deleted file mode 100644
index ccbfd73a..00000000
--- a/aconfig/trunk_staging/android.permission.flags/unknown_call_package_install_blocking_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "unknown_call_package_install_blocking_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/unknown_call_setting_blocked_logging_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/unknown_call_setting_blocked_logging_enabled_flag_values.textproto
deleted file mode 100644
index b0cea9a5..00000000
--- a/aconfig/trunk_staging/android.permission.flags/unknown_call_setting_blocked_logging_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "unknown_call_setting_blocked_logging_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/updatable_text_classifier_for_otp_detection_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/updatable_text_classifier_for_otp_detection_enabled_flag_values.textproto
deleted file mode 100644
index 5d58b1be..00000000
--- a/aconfig/trunk_staging/android.permission.flags/updatable_text_classifier_for_otp_detection_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "updatable_text_classifier_for_otp_detection_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/use_frozen_aware_remote_callback_list_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/use_frozen_aware_remote_callback_list_flag_values.textproto
deleted file mode 100644
index 47acc557..00000000
--- a/aconfig/trunk_staging/android.permission.flags/use_frozen_aware_remote_callback_list_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "use_frozen_aware_remote_callback_list"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/use_profile_labels_for_default_app_section_titles_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/use_profile_labels_for_default_app_section_titles_flag_values.textproto
deleted file mode 100644
index dc77438f..00000000
--- a/aconfig/trunk_staging/android.permission.flags/use_profile_labels_for_default_app_section_titles_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "use_profile_labels_for_default_app_section_titles"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/use_system_selection_toolbar_in_sysui_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/use_system_selection_toolbar_in_sysui_flag_values.textproto
deleted file mode 100644
index 002f2971..00000000
--- a/aconfig/trunk_staging/android.permission.flags/use_system_selection_toolbar_in_sysui_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "use_system_selection_toolbar_in_sysui"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/wallet_role_cross_user_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/wallet_role_cross_user_enabled_flag_values.textproto
deleted file mode 100644
index 44b1bc30..00000000
--- a/aconfig/trunk_staging/android.permission.flags/wallet_role_cross_user_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "wallet_role_cross_user_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/wallet_role_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/wallet_role_enabled_flag_values.textproto
deleted file mode 100644
index 1323f85e..00000000
--- a/aconfig/trunk_staging/android.permission.flags/wallet_role_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "wallet_role_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.permission.flags/wallet_role_icon_property_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/wallet_role_icon_property_enabled_flag_values.textproto
deleted file mode 100644
index 6987827a..00000000
--- a/aconfig/trunk_staging/android.permission.flags/wallet_role_icon_property_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.permission.flags"
-  name: "wallet_role_icon_property_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.provider.configinfrastructure.framework/Android.bp b/aconfig/trunk_staging/android.provider.configinfrastructure.framework/Android.bp
deleted file mode 100644
index 8e0013b7..00000000
--- a/aconfig/trunk_staging/android.provider.configinfrastructure.framework/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-android.provider.configinfrastructure.framework-all",
-  package: "android.provider.configinfrastructure.framework",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/android.provider.flags/Android.bp b/aconfig/trunk_staging/android.provider.flags/Android.bp
deleted file mode 100644
index 1d8df1fc..00000000
--- a/aconfig/trunk_staging/android.provider.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.provider.flags-all",
-    package: "android.provider.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.provider.flags/device_config_writable_namespaces_api_flag_values.textproto b/aconfig/trunk_staging/android.provider.flags/device_config_writable_namespaces_api_flag_values.textproto
deleted file mode 100644
index d1534296..00000000
--- a/aconfig/trunk_staging/android.provider.flags/device_config_writable_namespaces_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.provider.flags"
-  name: "device_config_writable_namespaces_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.provider.flags/enable_immediate_clear_override_bugfix_flag_values.textproto b/aconfig/trunk_staging/android.provider.flags/enable_immediate_clear_override_bugfix_flag_values.textproto
deleted file mode 100644
index 56a0e4da..00000000
--- a/aconfig/trunk_staging/android.provider.flags/enable_immediate_clear_override_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.provider.flags"
-  name: "enable_immediate_clear_override_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.provider.flags/new_storage_public_api_flag_values.textproto b/aconfig/trunk_staging/android.provider.flags/new_storage_public_api_flag_values.textproto
deleted file mode 100644
index d26a2b6a..00000000
--- a/aconfig/trunk_staging/android.provider.flags/new_storage_public_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.provider.flags"
-  name: "new_storage_public_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.provider.flags/new_storage_write_system_api_flag_values.textproto b/aconfig/trunk_staging/android.provider.flags/new_storage_write_system_api_flag_values.textproto
deleted file mode 100644
index 5bad891e..00000000
--- a/aconfig/trunk_staging/android.provider.flags/new_storage_write_system_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.provider.flags"
-  name: "new_storage_write_system_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.provider.flags/read_platform_from_platform_api_flag_values.textproto b/aconfig/trunk_staging/android.provider.flags/read_platform_from_platform_api_flag_values.textproto
deleted file mode 100644
index 13c19187..00000000
--- a/aconfig/trunk_staging/android.provider.flags/read_platform_from_platform_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.provider.flags"
-  name: "read_platform_from_platform_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.provider.flags/stage_flags_for_build_flag_values.textproto b/aconfig/trunk_staging/android.provider.flags/stage_flags_for_build_flag_values.textproto
deleted file mode 100644
index df9d768d..00000000
--- a/aconfig/trunk_staging/android.provider.flags/stage_flags_for_build_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.provider.flags"
-  name: "stage_flags_for_build"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.provider.flags/use_proto_input_stream_flag_values.textproto b/aconfig/trunk_staging/android.provider.flags/use_proto_input_stream_flag_values.textproto
deleted file mode 100644
index dc6941c9..00000000
--- a/aconfig/trunk_staging/android.provider.flags/use_proto_input_stream_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.provider.flags"
-  name: "use_proto_input_stream"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.provider/Android.bp b/aconfig/trunk_staging/android.provider/Android.bp
deleted file mode 100644
index af4bc9f5..00000000
--- a/aconfig/trunk_staging/android.provider/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.provider-all",
-    package: "android.provider",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.provider/a11y_standalone_gesture_enabled_flag_values.textproto b/aconfig/trunk_staging/android.provider/a11y_standalone_gesture_enabled_flag_values.textproto
deleted file mode 100644
index 748e2e39..00000000
--- a/aconfig/trunk_staging/android.provider/a11y_standalone_gesture_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.provider"
-  name: "a11y_standalone_gesture_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.provider/allow_config_maximum_call_log_entries_per_sim_flag_values.textproto b/aconfig/trunk_staging/android.provider/allow_config_maximum_call_log_entries_per_sim_flag_values.textproto
deleted file mode 100644
index b17559b9..00000000
--- a/aconfig/trunk_staging/android.provider/allow_config_maximum_call_log_entries_per_sim_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.provider"
-  name: "allow_config_maximum_call_log_entries_per_sim"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.provider/new_default_account_api_enabled_flag_values.textproto b/aconfig/trunk_staging/android.provider/new_default_account_api_enabled_flag_values.textproto
deleted file mode 100644
index 23861b33..00000000
--- a/aconfig/trunk_staging/android.provider/new_default_account_api_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.provider"
-  name: "new_default_account_api_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.provider/reduce_binder_transaction_size_for_get_all_properties_flag_values.textproto b/aconfig/trunk_staging/android.provider/reduce_binder_transaction_size_for_get_all_properties_flag_values.textproto
deleted file mode 100644
index 01b27dbd..00000000
--- a/aconfig/trunk_staging/android.provider/reduce_binder_transaction_size_for_get_all_properties_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.provider"
-  name: "reduce_binder_transaction_size_for_get_all_properties"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.provider/system_regional_preferences_api_enabled_flag_values.textproto b/aconfig/trunk_staging/android.provider/system_regional_preferences_api_enabled_flag_values.textproto
deleted file mode 100644
index 94d83f77..00000000
--- a/aconfig/trunk_staging/android.provider/system_regional_preferences_api_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.provider"
-  name: "system_regional_preferences_api_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.provider/system_settings_default_flag_values.textproto b/aconfig/trunk_staging/android.provider/system_settings_default_flag_values.textproto
deleted file mode 100644
index 15d5828b..00000000
--- a/aconfig/trunk_staging/android.provider/system_settings_default_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.provider"
-  name: "system_settings_default"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.provider/user_keys_flag_values.textproto b/aconfig/trunk_staging/android.provider/user_keys_flag_values.textproto
deleted file mode 100644
index aed1fb46..00000000
--- a/aconfig/trunk_staging/android.provider/user_keys_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.provider"
-  name: "user_keys"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.sdk/Android.bp b/aconfig/trunk_staging/android.sdk/Android.bp
deleted file mode 100644
index 958299fa..00000000
--- a/aconfig/trunk_staging/android.sdk/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-android.sdk-all",
-  package: "android.sdk",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/android.sdk/major_minor_versioning_scheme_flag_values.textproto b/aconfig/trunk_staging/android.sdk/major_minor_versioning_scheme_flag_values.textproto
deleted file mode 100644
index 58924896..00000000
--- a/aconfig/trunk_staging/android.sdk/major_minor_versioning_scheme_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.sdk"
-  name: "major_minor_versioning_scheme"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.security.flag/Android.bp b/aconfig/trunk_staging/android.security.flag/Android.bp
deleted file mode 100644
index f23d6150..00000000
--- a/aconfig/trunk_staging/android.security.flag/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-android.security.flag-all",
-  package: "android.security.flag",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/android.security.flag/deprecate_fsverity_init_flag_values.textproto b/aconfig/trunk_staging/android.security.flag/deprecate_fsverity_init_flag_values.textproto
deleted file mode 100644
index 42f3e47e..00000000
--- a/aconfig/trunk_staging/android.security.flag/deprecate_fsverity_init_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security.flag"
-  name: "deprecate_fsverity_init"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.security.keystore2/Android.bp b/aconfig/trunk_staging/android.security.keystore2/Android.bp
deleted file mode 100644
index 745758b9..00000000
--- a/aconfig/trunk_staging/android.security.keystore2/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.security.keystore2-all",
-    package: "android.security.keystore2",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.security.keystore2/attest_modules_flag_values.textproto b/aconfig/trunk_staging/android.security.keystore2/attest_modules_flag_values.textproto
deleted file mode 100644
index aea5a370..00000000
--- a/aconfig/trunk_staging/android.security.keystore2/attest_modules_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security.keystore2"
-  name: "attest_modules"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.security.keystore2/enable_dump_flag_values.textproto b/aconfig/trunk_staging/android.security.keystore2/enable_dump_flag_values.textproto
deleted file mode 100644
index 4ace1bf0..00000000
--- a/aconfig/trunk_staging/android.security.keystore2/enable_dump_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security.keystore2"
-  name: "enable_dump"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.security.keystore2/use_blob_state_column_flag_values.textproto b/aconfig/trunk_staging/android.security.keystore2/use_blob_state_column_flag_values.textproto
deleted file mode 100644
index 34794869..00000000
--- a/aconfig/trunk_staging/android.security.keystore2/use_blob_state_column_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security.keystore2"
-  name: "use_blob_state_column"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.security/Android.bp b/aconfig/trunk_staging/android.security/Android.bp
deleted file mode 100644
index e22df6ff..00000000
--- a/aconfig/trunk_staging/android.security/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.security-all",
-    package: "android.security",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.security/aapm_api_flag_values.textproto b/aconfig/trunk_staging/android.security/aapm_api_flag_values.textproto
deleted file mode 100644
index 43fe7a58..00000000
--- a/aconfig/trunk_staging/android.security/aapm_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "aapm_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.security/aapm_feature_disable_cellular_2g_flag_values.textproto b/aconfig/trunk_staging/android.security/aapm_feature_disable_cellular_2g_flag_values.textproto
deleted file mode 100644
index e817f622..00000000
--- a/aconfig/trunk_staging/android.security/aapm_feature_disable_cellular_2g_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "aapm_feature_disable_cellular_2g"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/aapm_feature_disable_install_unknown_sources_flag_values.textproto b/aconfig/trunk_staging/android.security/aapm_feature_disable_install_unknown_sources_flag_values.textproto
deleted file mode 100644
index 4e8a7cde..00000000
--- a/aconfig/trunk_staging/android.security/aapm_feature_disable_install_unknown_sources_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "aapm_feature_disable_install_unknown_sources"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/aapm_feature_memory_tagging_extension_flag_values.textproto b/aconfig/trunk_staging/android.security/aapm_feature_memory_tagging_extension_flag_values.textproto
deleted file mode 100644
index 4e8320aa..00000000
--- a/aconfig/trunk_staging/android.security/aapm_feature_memory_tagging_extension_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "aapm_feature_memory_tagging_extension"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/afl_api_flag_values.textproto b/aconfig/trunk_staging/android.security/afl_api_flag_values.textproto
deleted file mode 100644
index 9e53ec72..00000000
--- a/aconfig/trunk_staging/android.security/afl_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "afl_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/asm_reintroduce_grace_period_flag_values.textproto b/aconfig/trunk_staging/android.security/asm_reintroduce_grace_period_flag_values.textproto
deleted file mode 100644
index 95833961..00000000
--- a/aconfig/trunk_staging/android.security/asm_reintroduce_grace_period_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "asm_reintroduce_grace_period"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/asm_restrictions_enabled_flag_values.textproto b/aconfig/trunk_staging/android.security/asm_restrictions_enabled_flag_values.textproto
deleted file mode 100644
index 4e0b8a33..00000000
--- a/aconfig/trunk_staging/android.security/asm_restrictions_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "asm_restrictions_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/binary_transparency_sepolicy_hash_flag_values.textproto b/aconfig/trunk_staging/android.security/binary_transparency_sepolicy_hash_flag_values.textproto
deleted file mode 100644
index 17d79e28..00000000
--- a/aconfig/trunk_staging/android.security/binary_transparency_sepolicy_hash_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "binary_transparency_sepolicy_hash"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/block_null_action_intents_flag_values.textproto b/aconfig/trunk_staging/android.security/block_null_action_intents_flag_values.textproto
deleted file mode 100644
index c9427442..00000000
--- a/aconfig/trunk_staging/android.security/block_null_action_intents_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "block_null_action_intents"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/certificate_transparency_configuration_flag_values.textproto b/aconfig/trunk_staging/android.security/certificate_transparency_configuration_flag_values.textproto
deleted file mode 100644
index f110924b..00000000
--- a/aconfig/trunk_staging/android.security/certificate_transparency_configuration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "certificate_transparency_configuration"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/clear_strong_auth_on_adding_primary_credential_flag_values.textproto b/aconfig/trunk_staging/android.security/clear_strong_auth_on_adding_primary_credential_flag_values.textproto
deleted file mode 100644
index 7b8014f5..00000000
--- a/aconfig/trunk_staging/android.security/clear_strong_auth_on_adding_primary_credential_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "clear_strong_auth_on_adding_primary_credential"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/content_uri_permission_apis_flag_values.textproto b/aconfig/trunk_staging/android.security/content_uri_permission_apis_flag_values.textproto
deleted file mode 100644
index 764a0dbc..00000000
--- a/aconfig/trunk_staging/android.security/content_uri_permission_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "content_uri_permission_apis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/deprecate_fsv_sig_flag_values.textproto b/aconfig/trunk_staging/android.security/deprecate_fsv_sig_flag_values.textproto
deleted file mode 100644
index 43c80bbe..00000000
--- a/aconfig/trunk_staging/android.security/deprecate_fsv_sig_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "deprecate_fsv_sig"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/disable_adaptive_auth_counter_lock_flag_values.textproto b/aconfig/trunk_staging/android.security/disable_adaptive_auth_counter_lock_flag_values.textproto
deleted file mode 100644
index 49765e30..00000000
--- a/aconfig/trunk_staging/android.security/disable_adaptive_auth_counter_lock_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "disable_adaptive_auth_counter_lock"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/dump_attestation_verifications_flag_values.textproto b/aconfig/trunk_staging/android.security/dump_attestation_verifications_flag_values.textproto
deleted file mode 100644
index 79eaddaa..00000000
--- a/aconfig/trunk_staging/android.security/dump_attestation_verifications_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "dump_attestation_verifications"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/enable_intent_matching_flags_flag_values.textproto b/aconfig/trunk_staging/android.security/enable_intent_matching_flags_flag_values.textproto
deleted file mode 100644
index ba8e0624..00000000
--- a/aconfig/trunk_staging/android.security/enable_intent_matching_flags_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "enable_intent_matching_flags"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.security/enforce_intent_filter_match_flag_values.textproto b/aconfig/trunk_staging/android.security/enforce_intent_filter_match_flag_values.textproto
deleted file mode 100644
index b69c673f..00000000
--- a/aconfig/trunk_staging/android.security/enforce_intent_filter_match_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "enforce_intent_filter_match"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/extend_ecm_to_all_settings_flag_values.textproto b/aconfig/trunk_staging/android.security/extend_ecm_to_all_settings_flag_values.textproto
deleted file mode 100644
index 0f742bcd..00000000
--- a/aconfig/trunk_staging/android.security/extend_ecm_to_all_settings_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "extend_ecm_to_all_settings"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/extend_vb_chain_to_updated_apk_flag_values.textproto b/aconfig/trunk_staging/android.security/extend_vb_chain_to_updated_apk_flag_values.textproto
deleted file mode 100644
index ce4cea5c..00000000
--- a/aconfig/trunk_staging/android.security/extend_vb_chain_to_updated_apk_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "extend_vb_chain_to_updated_apk"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.security/fix_unlocked_device_required_keys_v2_flag_values.textproto b/aconfig/trunk_staging/android.security/fix_unlocked_device_required_keys_v2_flag_values.textproto
deleted file mode 100644
index 24c6f6d6..00000000
--- a/aconfig/trunk_staging/android.security/fix_unlocked_device_required_keys_v2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "fix_unlocked_device_required_keys_v2"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.security/frp_enforcement_flag_values.textproto b/aconfig/trunk_staging/android.security/frp_enforcement_flag_values.textproto
deleted file mode 100644
index f80665c7..00000000
--- a/aconfig/trunk_staging/android.security/frp_enforcement_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "frp_enforcement"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.security/fsverity_api_flag_values.textproto b/aconfig/trunk_staging/android.security/fsverity_api_flag_values.textproto
deleted file mode 100644
index 81cd3238..00000000
--- a/aconfig/trunk_staging/android.security/fsverity_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "fsverity_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/keyinfo_unlocked_device_required_flag_values.textproto b/aconfig/trunk_staging/android.security/keyinfo_unlocked_device_required_flag_values.textproto
deleted file mode 100644
index e67e9926..00000000
--- a/aconfig/trunk_staging/android.security/keyinfo_unlocked_device_required_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "keyinfo_unlocked_device_required"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/keystore_grant_api_flag_values.textproto b/aconfig/trunk_staging/android.security/keystore_grant_api_flag_values.textproto
deleted file mode 100644
index 7c52e91c..00000000
--- a/aconfig/trunk_staging/android.security/keystore_grant_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "keystore_grant_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/mgf1_digest_setter_v2_flag_values.textproto b/aconfig/trunk_staging/android.security/mgf1_digest_setter_v2_flag_values.textproto
deleted file mode 100644
index 85ccfab1..00000000
--- a/aconfig/trunk_staging/android.security/mgf1_digest_setter_v2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "mgf1_digest_setter_v2"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.security/prevent_intent_redirect_abort_or_throw_exception_flag_values.textproto b/aconfig/trunk_staging/android.security/prevent_intent_redirect_abort_or_throw_exception_flag_values.textproto
deleted file mode 100644
index a9e9a53a..00000000
--- a/aconfig/trunk_staging/android.security/prevent_intent_redirect_abort_or_throw_exception_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "prevent_intent_redirect_abort_or_throw_exception"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/prevent_intent_redirect_collect_nested_keys_on_server_if_not_collected_flag_values.textproto b/aconfig/trunk_staging/android.security/prevent_intent_redirect_collect_nested_keys_on_server_if_not_collected_flag_values.textproto
deleted file mode 100644
index e1efdd8f..00000000
--- a/aconfig/trunk_staging/android.security/prevent_intent_redirect_collect_nested_keys_on_server_if_not_collected_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "prevent_intent_redirect_collect_nested_keys_on_server_if_not_collected"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.security/prevent_intent_redirect_flag_values.textproto b/aconfig/trunk_staging/android.security/prevent_intent_redirect_flag_values.textproto
deleted file mode 100644
index 9a17f242..00000000
--- a/aconfig/trunk_staging/android.security/prevent_intent_redirect_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "prevent_intent_redirect"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.security/prevent_intent_redirect_show_toast_flag_values.textproto b/aconfig/trunk_staging/android.security/prevent_intent_redirect_show_toast_flag_values.textproto
deleted file mode 100644
index d3cab256..00000000
--- a/aconfig/trunk_staging/android.security/prevent_intent_redirect_show_toast_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "prevent_intent_redirect_show_toast"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.security/prevent_intent_redirect_show_toast_if_nested_keys_not_collected_r_w_flag_values.textproto b/aconfig/trunk_staging/android.security/prevent_intent_redirect_show_toast_if_nested_keys_not_collected_r_w_flag_values.textproto
deleted file mode 100644
index e9d7ca8c..00000000
--- a/aconfig/trunk_staging/android.security/prevent_intent_redirect_show_toast_if_nested_keys_not_collected_r_w_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "prevent_intent_redirect_show_toast_if_nested_keys_not_collected_r_w"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/protect_device_config_flags_flag_values.textproto b/aconfig/trunk_staging/android.security/protect_device_config_flags_flag_values.textproto
deleted file mode 100644
index d0686619..00000000
--- a/aconfig/trunk_staging/android.security/protect_device_config_flags_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "protect_device_config_flags"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.security/report_primary_auth_attempts_flag_values.textproto b/aconfig/trunk_staging/android.security/report_primary_auth_attempts_flag_values.textproto
deleted file mode 100644
index 98a8c097..00000000
--- a/aconfig/trunk_staging/android.security/report_primary_auth_attempts_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "report_primary_auth_attempts"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/secure_array_zeroization_flag_values.textproto b/aconfig/trunk_staging/android.security/secure_array_zeroization_flag_values.textproto
deleted file mode 100644
index e46762ee..00000000
--- a/aconfig/trunk_staging/android.security/secure_array_zeroization_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "secure_array_zeroization"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/secure_lockdown_flag_values.textproto b/aconfig/trunk_staging/android.security/secure_lockdown_flag_values.textproto
deleted file mode 100644
index 6f7cee29..00000000
--- a/aconfig/trunk_staging/android.security/secure_lockdown_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "secure_lockdown"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/significant_places_flag_values.textproto b/aconfig/trunk_staging/android.security/significant_places_flag_values.textproto
deleted file mode 100644
index 93100a04..00000000
--- a/aconfig/trunk_staging/android.security/significant_places_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "significant_places"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.security/subscribe_to_keyguard_locked_state_perm_priv_flag_flag_values.textproto b/aconfig/trunk_staging/android.security/subscribe_to_keyguard_locked_state_perm_priv_flag_flag_values.textproto
deleted file mode 100644
index d4d47862..00000000
--- a/aconfig/trunk_staging/android.security/subscribe_to_keyguard_locked_state_perm_priv_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "subscribe_to_keyguard_locked_state_perm_priv_flag"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.server.app/Android.bp b/aconfig/trunk_staging/android.server.app/Android.bp
deleted file mode 100644
index 67a2b416..00000000
--- a/aconfig/trunk_staging/android.server.app/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-android.server.app-all",
-  package: "android.server.app",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/android.server.app/disable_game_mode_when_app_top_flag_values.textproto b/aconfig/trunk_staging/android.server.app/disable_game_mode_when_app_top_flag_values.textproto
deleted file mode 100644
index acff4a38..00000000
--- a/aconfig/trunk_staging/android.server.app/disable_game_mode_when_app_top_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.server.app"
-  name: "disable_game_mode_when_app_top"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.server.app/game_default_frame_rate_flag_values.textproto b/aconfig/trunk_staging/android.server.app/game_default_frame_rate_flag_values.textproto
deleted file mode 100644
index 62357389..00000000
--- a/aconfig/trunk_staging/android.server.app/game_default_frame_rate_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.server.app"
-  name: "game_default_frame_rate"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.server/Android.bp b/aconfig/trunk_staging/android.server/Android.bp
deleted file mode 100644
index 290fd902..00000000
--- a/aconfig/trunk_staging/android.server/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.server-all",
-    package: "android.server",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.server/allow_network_time_update_service_flag_values.textproto b/aconfig/trunk_staging/android.server/allow_network_time_update_service_flag_values.textproto
deleted file mode 100644
index db1391ed..00000000
--- a/aconfig/trunk_staging/android.server/allow_network_time_update_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.server"
-  name: "allow_network_time_update_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.server/allow_removing_vpn_service_flag_values.textproto b/aconfig/trunk_staging/android.server/allow_removing_vpn_service_flag_values.textproto
deleted file mode 100644
index 0a82ff63..00000000
--- a/aconfig/trunk_staging/android.server/allow_removing_vpn_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.server"
-  name: "allow_removing_vpn_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.server/early_system_config_init_flag_values.textproto b/aconfig/trunk_staging/android.server/early_system_config_init_flag_values.textproto
deleted file mode 100644
index 7de51065..00000000
--- a/aconfig/trunk_staging/android.server/early_system_config_init_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.server"
-  name: "early_system_config_init"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.server/migrate_wrist_orientation_flag_values.textproto b/aconfig/trunk_staging/android.server/migrate_wrist_orientation_flag_values.textproto
deleted file mode 100644
index 84727b98..00000000
--- a/aconfig/trunk_staging/android.server/migrate_wrist_orientation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.server"
-  name: "migrate_wrist_orientation"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.server/remove_game_manager_service_from_wear_flag_values.textproto b/aconfig/trunk_staging/android.server/remove_game_manager_service_from_wear_flag_values.textproto
deleted file mode 100644
index 2e68373f..00000000
--- a/aconfig/trunk_staging/android.server/remove_game_manager_service_from_wear_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.server"
-  name: "remove_game_manager_service_from_wear"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.server/remove_text_service_flag_values.textproto b/aconfig/trunk_staging/android.server/remove_text_service_flag_values.textproto
deleted file mode 100644
index ba48e605..00000000
--- a/aconfig/trunk_staging/android.server/remove_text_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.server"
-  name: "remove_text_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.server/remove_wearable_sensing_service_from_wear_flag_values.textproto b/aconfig/trunk_staging/android.server/remove_wearable_sensing_service_from_wear_flag_values.textproto
deleted file mode 100644
index fa1e7817..00000000
--- a/aconfig/trunk_staging/android.server/remove_wearable_sensing_service_from_wear_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.server"
-  name: "remove_wearable_sensing_service_from_wear"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.server/telemetry_apis_service_flag_values.textproto b/aconfig/trunk_staging/android.server/telemetry_apis_service_flag_values.textproto
deleted file mode 100644
index f54856af..00000000
--- a/aconfig/trunk_staging/android.server/telemetry_apis_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.server"
-  name: "telemetry_apis_service"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.server/wear_gesture_api_flag_values.textproto b/aconfig/trunk_staging/android.server/wear_gesture_api_flag_values.textproto
deleted file mode 100644
index 97e96ab0..00000000
--- a/aconfig/trunk_staging/android.server/wear_gesture_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.server"
-  name: "wear_gesture_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.appprediction.flags/Android.bp b/aconfig/trunk_staging/android.service.appprediction.flags/Android.bp
deleted file mode 100644
index f761e188..00000000
--- a/aconfig/trunk_staging/android.service.appprediction.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-android.service.appprediction.flags-all",
-  package: "android.service.appprediction.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/android.service.appprediction.flags/service_features_api_flag_values.textproto b/aconfig/trunk_staging/android.service.appprediction.flags/service_features_api_flag_values.textproto
deleted file mode 100644
index 4eefed80..00000000
--- a/aconfig/trunk_staging/android.service.appprediction.flags/service_features_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.appprediction.flags"
-  name: "service_features_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.autofill/Android.bp b/aconfig/trunk_staging/android.service.autofill/Android.bp
deleted file mode 100644
index 84b26513..00000000
--- a/aconfig/trunk_staging/android.service.autofill/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.service.autofill-all",
-    package: "android.service.autofill",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.service.autofill/add_accessibility_title_for_augmented_autofill_dropdown_flag_values.textproto b/aconfig/trunk_staging/android.service.autofill/add_accessibility_title_for_augmented_autofill_dropdown_flag_values.textproto
deleted file mode 100644
index 3b56d36a..00000000
--- a/aconfig/trunk_staging/android.service.autofill/add_accessibility_title_for_augmented_autofill_dropdown_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.autofill"
-  name: "add_accessibility_title_for_augmented_autofill_dropdown"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.autofill/add_last_focused_id_to_fill_event_history_flag_values.textproto b/aconfig/trunk_staging/android.service.autofill/add_last_focused_id_to_fill_event_history_flag_values.textproto
deleted file mode 100644
index 3306e52c..00000000
--- a/aconfig/trunk_staging/android.service.autofill/add_last_focused_id_to_fill_event_history_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.autofill"
-  name: "add_last_focused_id_to_fill_event_history"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.autofill/autofill_credman_dev_integration_flag_values.textproto b/aconfig/trunk_staging/android.service.autofill/autofill_credman_dev_integration_flag_values.textproto
deleted file mode 100644
index 3b46871c..00000000
--- a/aconfig/trunk_staging/android.service.autofill/autofill_credman_dev_integration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.autofill"
-  name: "autofill_credman_dev_integration"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.autofill/autofill_credman_integration_flag_values.textproto b/aconfig/trunk_staging/android.service.autofill/autofill_credman_integration_flag_values.textproto
deleted file mode 100644
index 81a4ab18..00000000
--- a/aconfig/trunk_staging/android.service.autofill/autofill_credman_integration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.autofill"
-  name: "autofill_credman_integration"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.autofill/autofill_session_destroyed_flag_values.textproto b/aconfig/trunk_staging/android.service.autofill/autofill_session_destroyed_flag_values.textproto
deleted file mode 100644
index 2d5875c1..00000000
--- a/aconfig/trunk_staging/android.service.autofill/autofill_session_destroyed_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.autofill"
-  name: "autofill_session_destroyed"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.autofill/autofill_w_metrics_flag_values.textproto b/aconfig/trunk_staging/android.service.autofill/autofill_w_metrics_flag_values.textproto
deleted file mode 100644
index 9cda732c..00000000
--- a/aconfig/trunk_staging/android.service.autofill/autofill_w_metrics_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.autofill"
-  name: "autofill_w_metrics"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.autofill/fill_dialog_improvements_flag_values.textproto b/aconfig/trunk_staging/android.service.autofill/fill_dialog_improvements_flag_values.textproto
deleted file mode 100644
index 40a2180b..00000000
--- a/aconfig/trunk_staging/android.service.autofill/fill_dialog_improvements_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.autofill"
-  name: "fill_dialog_improvements"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.autofill/fill_fields_from_current_session_only_flag_values.textproto b/aconfig/trunk_staging/android.service.autofill/fill_fields_from_current_session_only_flag_values.textproto
deleted file mode 100644
index e8357b5c..00000000
--- a/aconfig/trunk_staging/android.service.autofill/fill_fields_from_current_session_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.autofill"
-  name: "fill_fields_from_current_session_only"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.autofill/fix_get_autofill_component_flag_values.textproto b/aconfig/trunk_staging/android.service.autofill/fix_get_autofill_component_flag_values.textproto
deleted file mode 100644
index 8a24b3b9..00000000
--- a/aconfig/trunk_staging/android.service.autofill/fix_get_autofill_component_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.autofill"
-  name: "fix_get_autofill_component"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.autofill/highlight_autofill_single_field_flag_values.textproto b/aconfig/trunk_staging/android.service.autofill/highlight_autofill_single_field_flag_values.textproto
deleted file mode 100644
index 5aedf777..00000000
--- a/aconfig/trunk_staging/android.service.autofill/highlight_autofill_single_field_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.autofill"
-  name: "highlight_autofill_single_field"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.autofill/improve_fill_dialog_aconfig_flag_values.textproto b/aconfig/trunk_staging/android.service.autofill/improve_fill_dialog_aconfig_flag_values.textproto
deleted file mode 100644
index 6055856d..00000000
--- a/aconfig/trunk_staging/android.service.autofill/improve_fill_dialog_aconfig_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.autofill"
-  name: "improve_fill_dialog_aconfig"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.autofill/multiple_fill_history_flag_values.textproto b/aconfig/trunk_staging/android.service.autofill/multiple_fill_history_flag_values.textproto
deleted file mode 100644
index fe58c941..00000000
--- a/aconfig/trunk_staging/android.service.autofill/multiple_fill_history_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.autofill"
-  name: "multiple_fill_history"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.autofill/relayout_fix_flag_values.textproto b/aconfig/trunk_staging/android.service.autofill/relayout_fix_flag_values.textproto
deleted file mode 100644
index 008eb17c..00000000
--- a/aconfig/trunk_staging/android.service.autofill/relayout_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.autofill"
-  name: "relayout_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.autofill/remote_fill_service_use_weak_reference_flag_values.textproto b/aconfig/trunk_staging/android.service.autofill/remote_fill_service_use_weak_reference_flag_values.textproto
deleted file mode 100644
index 4f6d1ba9..00000000
--- a/aconfig/trunk_staging/android.service.autofill/remote_fill_service_use_weak_reference_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.autofill"
-  name: "remote_fill_service_use_weak_reference"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.autofill/test_flag_flag_values.textproto b/aconfig/trunk_staging/android.service.autofill/test_flag_flag_values.textproto
deleted file mode 100644
index eb2903d4..00000000
--- a/aconfig/trunk_staging/android.service.autofill/test_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.autofill"
-  name: "test_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.autofill/test_flag_values.textproto b/aconfig/trunk_staging/android.service.autofill/test_flag_values.textproto
deleted file mode 100644
index a1c1ceae..00000000
--- a/aconfig/trunk_staging/android.service.autofill/test_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.autofill"
-  name: "test"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.chooser/Android.bp b/aconfig/trunk_staging/android.service.chooser/Android.bp
deleted file mode 100644
index 50e1952a..00000000
--- a/aconfig/trunk_staging/android.service.chooser/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.service.chooser-all",
-    package: "android.service.chooser",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.service.chooser/announce_shortcuts_and_suggested_apps_legacy_flag_values.textproto b/aconfig/trunk_staging/android.service.chooser/announce_shortcuts_and_suggested_apps_legacy_flag_values.textproto
deleted file mode 100644
index 6ab72ce0..00000000
--- a/aconfig/trunk_staging/android.service.chooser/announce_shortcuts_and_suggested_apps_legacy_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.chooser"
-  name: "announce_shortcuts_and_suggested_apps_legacy"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.chooser/chooser_album_text_flag_values.textproto b/aconfig/trunk_staging/android.service.chooser/chooser_album_text_flag_values.textproto
deleted file mode 100644
index 59717ea8..00000000
--- a/aconfig/trunk_staging/android.service.chooser/chooser_album_text_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.chooser"
-  name: "chooser_album_text"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.chooser/chooser_payload_toggling_flag_values.textproto b/aconfig/trunk_staging/android.service.chooser/chooser_payload_toggling_flag_values.textproto
deleted file mode 100644
index 80201b54..00000000
--- a/aconfig/trunk_staging/android.service.chooser/chooser_payload_toggling_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.chooser"
-  name: "chooser_payload_toggling"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.chooser/enable_chooser_result_flag_values.textproto b/aconfig/trunk_staging/android.service.chooser/enable_chooser_result_flag_values.textproto
deleted file mode 100644
index eb027fa2..00000000
--- a/aconfig/trunk_staging/android.service.chooser/enable_chooser_result_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.chooser"
-  name: "enable_chooser_result"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.chooser/enable_sharesheet_metadata_extra_flag_values.textproto b/aconfig/trunk_staging/android.service.chooser/enable_sharesheet_metadata_extra_flag_values.textproto
deleted file mode 100644
index 52e1cf6a..00000000
--- a/aconfig/trunk_staging/android.service.chooser/enable_sharesheet_metadata_extra_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.chooser"
-  name: "enable_sharesheet_metadata_extra"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.chooser/fix_resolver_memory_leak_flag_values.textproto b/aconfig/trunk_staging/android.service.chooser/fix_resolver_memory_leak_flag_values.textproto
deleted file mode 100644
index e611e389..00000000
--- a/aconfig/trunk_staging/android.service.chooser/fix_resolver_memory_leak_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.chooser"
-  name: "fix_resolver_memory_leak"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.chooser/notify_single_item_change_on_icon_load_flag_values.textproto b/aconfig/trunk_staging/android.service.chooser/notify_single_item_change_on_icon_load_flag_values.textproto
deleted file mode 100644
index 93bf70ac..00000000
--- a/aconfig/trunk_staging/android.service.chooser/notify_single_item_change_on_icon_load_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.chooser"
-  name: "notify_single_item_change_on_icon_load"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.controls.flags/Android.bp b/aconfig/trunk_staging/android.service.controls.flags/Android.bp
deleted file mode 100644
index 6397e2df..00000000
--- a/aconfig/trunk_staging/android.service.controls.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-android.service.controls.flags-all",
-  package: "android.service.controls.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/android.service.controls.flags/home_panel_dream_flag_values.textproto b/aconfig/trunk_staging/android.service.controls.flags/home_panel_dream_flag_values.textproto
deleted file mode 100644
index fd389fd7..00000000
--- a/aconfig/trunk_staging/android.service.controls.flags/home_panel_dream_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.controls.flags"
-  name: "home_panel_dream"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.dreams/Android.bp b/aconfig/trunk_staging/android.service.dreams/Android.bp
deleted file mode 100644
index 2c2b52a2..00000000
--- a/aconfig/trunk_staging/android.service.dreams/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.service.dreams-all",
-    package: "android.service.dreams",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.service.dreams/allow_dream_when_postured_flag_values.textproto b/aconfig/trunk_staging/android.service.dreams/allow_dream_when_postured_flag_values.textproto
deleted file mode 100644
index 0efaefec..00000000
--- a/aconfig/trunk_staging/android.service.dreams/allow_dream_when_postured_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.dreams"
-  name: "allow_dream_when_postured"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.dreams/cleanup_dream_settings_on_uninstall_flag_values.textproto b/aconfig/trunk_staging/android.service.dreams/cleanup_dream_settings_on_uninstall_flag_values.textproto
deleted file mode 100644
index 4490f85c..00000000
--- a/aconfig/trunk_staging/android.service.dreams/cleanup_dream_settings_on_uninstall_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.dreams"
-  name: "cleanup_dream_settings_on_uninstall"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.dreams/dismiss_dream_on_keyguard_dismiss_flag_values.textproto b/aconfig/trunk_staging/android.service.dreams/dismiss_dream_on_keyguard_dismiss_flag_values.textproto
deleted file mode 100644
index 8deb29c5..00000000
--- a/aconfig/trunk_staging/android.service.dreams/dismiss_dream_on_keyguard_dismiss_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.dreams"
-  name: "dismiss_dream_on_keyguard_dismiss"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.dreams/dream_handles_being_obscured_flag_values.textproto b/aconfig/trunk_staging/android.service.dreams/dream_handles_being_obscured_flag_values.textproto
deleted file mode 100644
index 89dc008e..00000000
--- a/aconfig/trunk_staging/android.service.dreams/dream_handles_being_obscured_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.dreams"
-  name: "dream_handles_being_obscured"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.dreams/dream_handles_confirm_keys_flag_values.textproto b/aconfig/trunk_staging/android.service.dreams/dream_handles_confirm_keys_flag_values.textproto
deleted file mode 100644
index 5d27ce2c..00000000
--- a/aconfig/trunk_staging/android.service.dreams/dream_handles_confirm_keys_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.dreams"
-  name: "dream_handles_confirm_keys"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.dreams/dream_wake_redirect_flag_values.textproto b/aconfig/trunk_staging/android.service.dreams/dream_wake_redirect_flag_values.textproto
deleted file mode 100644
index 02f9156e..00000000
--- a/aconfig/trunk_staging/android.service.dreams/dream_wake_redirect_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.dreams"
-  name: "dream_wake_redirect"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.dreams/start_and_stop_dozing_in_background_flag_values.textproto b/aconfig/trunk_staging/android.service.dreams/start_and_stop_dozing_in_background_flag_values.textproto
deleted file mode 100644
index a96d7674..00000000
--- a/aconfig/trunk_staging/android.service.dreams/start_and_stop_dozing_in_background_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.dreams"
-  name: "start_and_stop_dozing_in_background"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.notification/Android.bp b/aconfig/trunk_staging/android.service.notification/Android.bp
deleted file mode 100644
index f78712cd..00000000
--- a/aconfig/trunk_staging/android.service.notification/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.service.notification-all",
-    package: "android.service.notification",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.service.notification/TEST_MAPPING b/aconfig/trunk_staging/android.service.notification/TEST_MAPPING
deleted file mode 100644
index 7c7d0d03..00000000
--- a/aconfig/trunk_staging/android.service.notification/TEST_MAPPING
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "imports": [
-    {
-      "path": "frameworks/base/packages/SystemUI"
-    },
-    {
-      "path": "frameworks/base/services/core/java/com/android/server/notification"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/aconfig/trunk_staging/android.service.notification/callstyle_callback_api_flag_values.textproto b/aconfig/trunk_staging/android.service.notification/callstyle_callback_api_flag_values.textproto
deleted file mode 100644
index 570fff28..00000000
--- a/aconfig/trunk_staging/android.service.notification/callstyle_callback_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.notification"
-  name: "callstyle_callback_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.service.notification/notification_classification_flag_values.textproto b/aconfig/trunk_staging/android.service.notification/notification_classification_flag_values.textproto
deleted file mode 100644
index b81a11f8..00000000
--- a/aconfig/trunk_staging/android.service.notification/notification_classification_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.notification"
-  name: "notification_classification"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.notification/notification_conversation_channel_management_flag_values.textproto b/aconfig/trunk_staging/android.service.notification/notification_conversation_channel_management_flag_values.textproto
deleted file mode 100644
index 129fade4..00000000
--- a/aconfig/trunk_staging/android.service.notification/notification_conversation_channel_management_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.notification"
-  name: "notification_conversation_channel_management"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.notification/notification_force_grouping_flag_values.textproto b/aconfig/trunk_staging/android.service.notification/notification_force_grouping_flag_values.textproto
deleted file mode 100644
index 2e1e00c4..00000000
--- a/aconfig/trunk_staging/android.service.notification/notification_force_grouping_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.notification"
-  name: "notification_force_grouping"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.notification/notification_regroup_on_classification_flag_values.textproto b/aconfig/trunk_staging/android.service.notification/notification_regroup_on_classification_flag_values.textproto
deleted file mode 100644
index 6a02e20a..00000000
--- a/aconfig/trunk_staging/android.service.notification/notification_regroup_on_classification_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.notification"
-  name: "notification_regroup_on_classification"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.notification/ranking_update_ashmem_flag_values.textproto b/aconfig/trunk_staging/android.service.notification/ranking_update_ashmem_flag_values.textproto
deleted file mode 100644
index 30ac9933..00000000
--- a/aconfig/trunk_staging/android.service.notification/ranking_update_ashmem_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.notification"
-  name: "ranking_update_ashmem"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.notification/redact_sensitive_notifications_big_text_style_flag_values.textproto b/aconfig/trunk_staging/android.service.notification/redact_sensitive_notifications_big_text_style_flag_values.textproto
deleted file mode 100644
index 0248fac3..00000000
--- a/aconfig/trunk_staging/android.service.notification/redact_sensitive_notifications_big_text_style_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.notification"
-  name: "redact_sensitive_notifications_big_text_style"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.notification/redact_sensitive_notifications_from_untrusted_listeners_flag_values.textproto b/aconfig/trunk_staging/android.service.notification/redact_sensitive_notifications_from_untrusted_listeners_flag_values.textproto
deleted file mode 100644
index 0f32bb52..00000000
--- a/aconfig/trunk_staging/android.service.notification/redact_sensitive_notifications_from_untrusted_listeners_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.notification"
-  name: "redact_sensitive_notifications_from_untrusted_listeners"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.quickaccesswallet/Android.bp b/aconfig/trunk_staging/android.service.quickaccesswallet/Android.bp
deleted file mode 100644
index 6dce07d2..00000000
--- a/aconfig/trunk_staging/android.service.quickaccesswallet/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.service.quickaccesswallet-all",
-    package: "android.service.quickaccesswallet",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.service.quickaccesswallet/launch_selected_card_from_qs_tile_flag_values.textproto b/aconfig/trunk_staging/android.service.quickaccesswallet/launch_selected_card_from_qs_tile_flag_values.textproto
deleted file mode 100644
index 38938cf2..00000000
--- a/aconfig/trunk_staging/android.service.quickaccesswallet/launch_selected_card_from_qs_tile_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.quickaccesswallet"
-  name: "launch_selected_card_from_qs_tile"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.quickaccesswallet/launch_wallet_option_on_power_double_tap_flag_values.textproto b/aconfig/trunk_staging/android.service.quickaccesswallet/launch_wallet_option_on_power_double_tap_flag_values.textproto
deleted file mode 100644
index 8506616d..00000000
--- a/aconfig/trunk_staging/android.service.quickaccesswallet/launch_wallet_option_on_power_double_tap_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.quickaccesswallet"
-  name: "launch_wallet_option_on_power_double_tap"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.quickaccesswallet/launch_wallet_via_sysui_callbacks_flag_values.textproto b/aconfig/trunk_staging/android.service.quickaccesswallet/launch_wallet_via_sysui_callbacks_flag_values.textproto
deleted file mode 100644
index a28f00ee..00000000
--- a/aconfig/trunk_staging/android.service.quickaccesswallet/launch_wallet_via_sysui_callbacks_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.quickaccesswallet"
-  name: "launch_wallet_via_sysui_callbacks"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.voice.flags/Android.bp b/aconfig/trunk_staging/android.service.voice.flags/Android.bp
deleted file mode 100644
index 6303bd36..00000000
--- a/aconfig/trunk_staging/android.service.voice.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-android.service.voice.flags-all",
-  package: "android.service.voice.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/android.service.voice.flags/allow_foreground_activities_in_on_show_flag_values.textproto b/aconfig/trunk_staging/android.service.voice.flags/allow_foreground_activities_in_on_show_flag_values.textproto
deleted file mode 100644
index 35833d03..00000000
--- a/aconfig/trunk_staging/android.service.voice.flags/allow_foreground_activities_in_on_show_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.voice.flags"
-  name: "allow_foreground_activities_in_on_show"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.voice.flags/allow_hotword_bump_egress_flag_values.textproto b/aconfig/trunk_staging/android.service.voice.flags/allow_hotword_bump_egress_flag_values.textproto
deleted file mode 100644
index 441eaac2..00000000
--- a/aconfig/trunk_staging/android.service.voice.flags/allow_hotword_bump_egress_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.voice.flags"
-  name: "allow_hotword_bump_egress"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.service.voice.flags/allow_training_data_egress_from_hds_flag_values.textproto b/aconfig/trunk_staging/android.service.voice.flags/allow_training_data_egress_from_hds_flag_values.textproto
deleted file mode 100644
index a6010bf4..00000000
--- a/aconfig/trunk_staging/android.service.voice.flags/allow_training_data_egress_from_hds_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.service.voice.flags"
-  name: "allow_training_data_egress_from_hds"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.speech.flags/Android.bp b/aconfig/trunk_staging/android.speech.flags/Android.bp
deleted file mode 100644
index b9eae383..00000000
--- a/aconfig/trunk_staging/android.speech.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-android.speech.flags-all",
-  package: "android.speech.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/android.speech.flags/multilang_extra_launch_flag_values.textproto b/aconfig/trunk_staging/android.speech.flags/multilang_extra_launch_flag_values.textproto
deleted file mode 100644
index 6578a99f..00000000
--- a/aconfig/trunk_staging/android.speech.flags/multilang_extra_launch_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.speech.flags"
-  name: "multilang_extra_launch"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.tracing/Android.bp b/aconfig/trunk_staging/android.tracing/Android.bp
deleted file mode 100644
index 3c505242..00000000
--- a/aconfig/trunk_staging/android.tracing/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.tracing-all",
-    package: "android.tracing",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.tracing/client_side_proto_logging_flag_values.textproto b/aconfig/trunk_staging/android.tracing/client_side_proto_logging_flag_values.textproto
deleted file mode 100644
index b3b2a89c..00000000
--- a/aconfig/trunk_staging/android.tracing/client_side_proto_logging_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.tracing"
-  name: "client_side_proto_logging"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.tracing/perfetto_ime_flag_values.textproto b/aconfig/trunk_staging/android.tracing/perfetto_ime_flag_values.textproto
deleted file mode 100644
index 38186452..00000000
--- a/aconfig/trunk_staging/android.tracing/perfetto_ime_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.tracing"
-  name: "perfetto_ime"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.tracing/perfetto_protolog_tracing_flag_values.textproto b/aconfig/trunk_staging/android.tracing/perfetto_protolog_tracing_flag_values.textproto
deleted file mode 100644
index 3a3e5ede..00000000
--- a/aconfig/trunk_staging/android.tracing/perfetto_protolog_tracing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.tracing"
-  name: "perfetto_protolog_tracing"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.tracing/perfetto_transition_tracing_flag_values.textproto b/aconfig/trunk_staging/android.tracing/perfetto_transition_tracing_flag_values.textproto
deleted file mode 100644
index 8d908bf7..00000000
--- a/aconfig/trunk_staging/android.tracing/perfetto_transition_tracing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.tracing"
-  name: "perfetto_transition_tracing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.tracing/perfetto_view_capture_tracing_flag_values.textproto b/aconfig/trunk_staging/android.tracing/perfetto_view_capture_tracing_flag_values.textproto
deleted file mode 100644
index 315ea3ce..00000000
--- a/aconfig/trunk_staging/android.tracing/perfetto_view_capture_tracing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.tracing"
-  name: "perfetto_view_capture_tracing"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.tracing/perfetto_wm_dump_flag_values.textproto b/aconfig/trunk_staging/android.tracing/perfetto_wm_dump_flag_values.textproto
deleted file mode 100644
index 029736e2..00000000
--- a/aconfig/trunk_staging/android.tracing/perfetto_wm_dump_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.tracing"
-  name: "perfetto_wm_dump"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.tracing/perfetto_wm_tracing_flag_values.textproto b/aconfig/trunk_staging/android.tracing/perfetto_wm_tracing_flag_values.textproto
deleted file mode 100644
index 07b186d8..00000000
--- a/aconfig/trunk_staging/android.tracing/perfetto_wm_tracing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.tracing"
-  name: "perfetto_wm_tracing"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.tracing/system_server_large_perfetto_shmem_buffer_flag_values.textproto b/aconfig/trunk_staging/android.tracing/system_server_large_perfetto_shmem_buffer_flag_values.textproto
deleted file mode 100644
index 2520e6e9..00000000
--- a/aconfig/trunk_staging/android.tracing/system_server_large_perfetto_shmem_buffer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.tracing"
-  name: "system_server_large_perfetto_shmem_buffer"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.uprobestats.flags/Android.bp b/aconfig/trunk_staging/android.uprobestats.flags/Android.bp
deleted file mode 100644
index 7366c7b6..00000000
--- a/aconfig/trunk_staging/android.uprobestats.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.uprobestats.flags-all",
-    package: "android.uprobestats.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.uprobestats.flags/executable_method_file_offsets_flag_values.textproto b/aconfig/trunk_staging/android.uprobestats.flags/executable_method_file_offsets_flag_values.textproto
deleted file mode 100644
index 424940eb..00000000
--- a/aconfig/trunk_staging/android.uprobestats.flags/executable_method_file_offsets_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.uprobestats.flags"
-  name: "executable_method_file_offsets"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.uprobestats.mainline.flags/Android.bp b/aconfig/trunk_staging/android.uprobestats.mainline.flags/Android.bp
deleted file mode 100644
index 04f1479b..00000000
--- a/aconfig/trunk_staging/android.uprobestats.mainline.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.uprobestats.mainline.flags-all",
-    package: "android.uprobestats.mainline.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.uprobestats.mainline.flags/enable_uprobestats_flag_values.textproto b/aconfig/trunk_staging/android.uprobestats.mainline.flags/enable_uprobestats_flag_values.textproto
deleted file mode 100644
index 54ddb586..00000000
--- a/aconfig/trunk_staging/android.uprobestats.mainline.flags/enable_uprobestats_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.uprobestats.mainline.flags"
-  name: "enable_uprobestats"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.uprobestats.mainline.flags/executable_method_file_offsets_flag_values.textproto b/aconfig/trunk_staging/android.uprobestats.mainline.flags/executable_method_file_offsets_flag_values.textproto
deleted file mode 100644
index 3044ef74..00000000
--- a/aconfig/trunk_staging/android.uprobestats.mainline.flags/executable_method_file_offsets_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.uprobestats.mainline.flags"
-  name: "executable_method_file_offsets"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.uprobestats.mainline.flags/uprobestats_support_update_device_idle_temp_allowlist_flag_values.textproto b/aconfig/trunk_staging/android.uprobestats.mainline.flags/uprobestats_support_update_device_idle_temp_allowlist_flag_values.textproto
deleted file mode 100644
index b63502f7..00000000
--- a/aconfig/trunk_staging/android.uprobestats.mainline.flags/uprobestats_support_update_device_idle_temp_allowlist_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.uprobestats.mainline.flags"
-  name: "uprobestats_support_update_device_idle_temp_allowlist"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/Android.bp b/aconfig/trunk_staging/android.view.accessibility/Android.bp
deleted file mode 100644
index f5f51b24..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.view.accessibility-all",
-    package: "android.view.accessibility",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/TEST_MAPPING b/aconfig/trunk_staging/android.view.accessibility/TEST_MAPPING
deleted file mode 100644
index ccac2489..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/TEST_MAPPING
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "imports": [
-    {
-      "path": "frameworks/base/core/java/android/view/accessibility/TEST_MAPPING"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/aconfig/trunk_staging/android.view.accessibility/a11y_character_in_window_api_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/a11y_character_in_window_api_flag_values.textproto
deleted file mode 100644
index 00251192..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/a11y_character_in_window_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "a11y_character_in_window_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/a11y_expansion_state_api_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/a11y_expansion_state_api_flag_values.textproto
deleted file mode 100644
index 53d3bad3..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/a11y_expansion_state_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "a11y_expansion_state_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/a11y_is_required_api_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/a11y_is_required_api_flag_values.textproto
deleted file mode 100644
index 884f14f0..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/a11y_is_required_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "a11y_is_required_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/a11y_overlay_callbacks_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/a11y_overlay_callbacks_flag_values.textproto
deleted file mode 100644
index c7670f1f..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/a11y_overlay_callbacks_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "a11y_overlay_callbacks"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/a11y_qs_shortcut_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/a11y_qs_shortcut_flag_values.textproto
deleted file mode 100644
index d946f4f3..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/a11y_qs_shortcut_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "a11y_qs_shortcut"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/a11y_selection_api_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/a11y_selection_api_flag_values.textproto
deleted file mode 100644
index 4c39c9d9..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/a11y_selection_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "a11y_selection_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/allow_shortcut_chooser_on_lockscreen_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/allow_shortcut_chooser_on_lockscreen_flag_values.textproto
deleted file mode 100644
index 98ab01d4..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/allow_shortcut_chooser_on_lockscreen_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "allow_shortcut_chooser_on_lockscreen"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/braille_display_hid_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/braille_display_hid_flag_values.textproto
deleted file mode 100644
index 43b3aa31..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/braille_display_hid_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "braille_display_hid"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/cleanup_accessibility_warning_dialog_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/cleanup_accessibility_warning_dialog_flag_values.textproto
deleted file mode 100644
index bc4d7811..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/cleanup_accessibility_warning_dialog_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "cleanup_accessibility_warning_dialog"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/collection_info_item_counts_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/collection_info_item_counts_flag_values.textproto
deleted file mode 100644
index 37d4813e..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/collection_info_item_counts_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "collection_info_item_counts"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/copy_events_for_gesture_detection_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/copy_events_for_gesture_detection_flag_values.textproto
deleted file mode 100644
index aa69d096..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/copy_events_for_gesture_detection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "copy_events_for_gesture_detection"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/deprecate_accessibility_announcement_apis_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/deprecate_accessibility_announcement_apis_flag_values.textproto
deleted file mode 100644
index e1f0a5c9..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/deprecate_accessibility_announcement_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "deprecate_accessibility_announcement_apis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/deprecate_ani_label_for_apis_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/deprecate_ani_label_for_apis_flag_values.textproto
deleted file mode 100644
index e8bbabad..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/deprecate_ani_label_for_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "deprecate_ani_label_for_apis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/enable_system_pinch_zoom_gesture_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/enable_system_pinch_zoom_gesture_flag_values.textproto
deleted file mode 100644
index d21649a0..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/enable_system_pinch_zoom_gesture_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "enable_system_pinch_zoom_gesture"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/enable_type_window_control_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/enable_type_window_control_flag_values.textproto
deleted file mode 100644
index fba6fa15..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/enable_type_window_control_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "enable_type_window_control"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/fix_merged_content_change_event_v2_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/fix_merged_content_change_event_v2_flag_values.textproto
deleted file mode 100644
index c1eab1c5..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/fix_merged_content_change_event_v2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "fix_merged_content_change_event_v2"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/flash_notification_system_api_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/flash_notification_system_api_flag_values.textproto
deleted file mode 100644
index bdce84f7..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/flash_notification_system_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "flash_notification_system_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/focus_rect_min_size_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/focus_rect_min_size_flag_values.textproto
deleted file mode 100644
index 1450b717..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/focus_rect_min_size_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "focus_rect_min_size"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/force_invert_color_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/force_invert_color_flag_values.textproto
deleted file mode 100644
index 6adbc066..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/force_invert_color_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "force_invert_color"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/global_action_media_play_pause_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/global_action_media_play_pause_flag_values.textproto
deleted file mode 100644
index a54f882e..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/global_action_media_play_pause_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "global_action_media_play_pause"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/global_action_menu_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/global_action_menu_flag_values.textproto
deleted file mode 100644
index 68d99a09..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/global_action_menu_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "global_action_menu"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/granular_scrolling_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/granular_scrolling_flag_values.textproto
deleted file mode 100644
index 6310a979..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/granular_scrolling_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "granular_scrolling"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/indeterminate_range_info_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/indeterminate_range_info_flag_values.textproto
deleted file mode 100644
index c76a5577..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/indeterminate_range_info_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "indeterminate_range_info"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/migrate_enable_shortcuts_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/migrate_enable_shortcuts_flag_values.textproto
deleted file mode 100644
index 47e44225..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/migrate_enable_shortcuts_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "migrate_enable_shortcuts"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/motion_event_observing_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/motion_event_observing_flag_values.textproto
deleted file mode 100644
index 959d0da7..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/motion_event_observing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "motion_event_observing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/prevent_a11y_nontool_from_injecting_into_sensitive_views_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/prevent_a11y_nontool_from_injecting_into_sensitive_views_flag_values.textproto
deleted file mode 100644
index 5a072a24..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/prevent_a11y_nontool_from_injecting_into_sensitive_views_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "prevent_a11y_nontool_from_injecting_into_sensitive_views"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/reduce_window_content_changed_event_throttle_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/reduce_window_content_changed_event_throttle_flag_values.textproto
deleted file mode 100644
index ef4be71d..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/reduce_window_content_changed_event_throttle_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "reduce_window_content_changed_event_throttle"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/remove_child_hover_check_for_touch_exploration_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/remove_child_hover_check_for_touch_exploration_flag_values.textproto
deleted file mode 100644
index ef11b83e..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/remove_child_hover_check_for_touch_exploration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "remove_child_hover_check_for_touch_exploration"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/restore_a11y_secure_settings_on_hsum_device_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/restore_a11y_secure_settings_on_hsum_device_flag_values.textproto
deleted file mode 100644
index 3ab9110c..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/restore_a11y_secure_settings_on_hsum_device_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "restore_a11y_secure_settings_on_hsum_device"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/restore_a11y_shortcut_target_service_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/restore_a11y_shortcut_target_service_flag_values.textproto
deleted file mode 100644
index ac4eb7f4..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/restore_a11y_shortcut_target_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "restore_a11y_shortcut_target_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/skip_accessibility_warning_dialog_for_trusted_services_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/skip_accessibility_warning_dialog_for_trusted_services_flag_values.textproto
deleted file mode 100644
index 89608a92..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/skip_accessibility_warning_dialog_for_trusted_services_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "skip_accessibility_warning_dialog_for_trusted_services"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/supplemental_description_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/supplemental_description_flag_values.textproto
deleted file mode 100644
index c0413d14..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/supplemental_description_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "supplemental_description"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/support_multiple_labeledby_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/support_multiple_labeledby_flag_values.textproto
deleted file mode 100644
index 438072ee..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/support_multiple_labeledby_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "support_multiple_labeledby"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/tri_state_checked_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/tri_state_checked_flag_values.textproto
deleted file mode 100644
index dcb098b5..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/tri_state_checked_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "tri_state_checked"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/update_always_on_a11y_service_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/update_always_on_a11y_service_flag_values.textproto
deleted file mode 100644
index 3e79aeb2..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/update_always_on_a11y_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "update_always_on_a11y_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.accessibility/warning_use_default_dialog_type_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/warning_use_default_dialog_type_flag_values.textproto
deleted file mode 100644
index 38a98595..00000000
--- a/aconfig/trunk_staging/android.view.accessibility/warning_use_default_dialog_type_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.accessibility"
-  name: "warning_use_default_dialog_type"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.contentcapture.flags/Android.bp b/aconfig/trunk_staging/android.view.contentcapture.flags/Android.bp
deleted file mode 100644
index a466c098..00000000
--- a/aconfig/trunk_staging/android.view.contentcapture.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.view.contentcapture.flags-all",
-    package: "android.view.contentcapture.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.view.contentcapture.flags/ccapi_baklava_enabled_flag_values.textproto b/aconfig/trunk_staging/android.view.contentcapture.flags/ccapi_baklava_enabled_flag_values.textproto
deleted file mode 100644
index d95ce0d8..00000000
--- a/aconfig/trunk_staging/android.view.contentcapture.flags/ccapi_baklava_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.contentcapture.flags"
-  name: "ccapi_baklava_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.contentcapture.flags/flush_after_each_frame_flag_values.textproto b/aconfig/trunk_staging/android.view.contentcapture.flags/flush_after_each_frame_flag_values.textproto
deleted file mode 100644
index 821e7fcf..00000000
--- a/aconfig/trunk_staging/android.view.contentcapture.flags/flush_after_each_frame_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.contentcapture.flags"
-  name: "flush_after_each_frame"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.contentcapture.flags/run_on_background_thread_enabled_flag_values.textproto b/aconfig/trunk_staging/android.view.contentcapture.flags/run_on_background_thread_enabled_flag_values.textproto
deleted file mode 100644
index 0ec97f2a..00000000
--- a/aconfig/trunk_staging/android.view.contentcapture.flags/run_on_background_thread_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.contentcapture.flags"
-  name: "run_on_background_thread_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.contentprotection.flags/Android.bp b/aconfig/trunk_staging/android.view.contentprotection.flags/Android.bp
deleted file mode 100644
index dd9b89c3..00000000
--- a/aconfig/trunk_staging/android.view.contentprotection.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.view.contentprotection.flags-all",
-    package: "android.view.contentprotection.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.view.contentprotection.flags/blocklist_update_enabled_flag_values.textproto b/aconfig/trunk_staging/android.view.contentprotection.flags/blocklist_update_enabled_flag_values.textproto
deleted file mode 100644
index 9d183dbe..00000000
--- a/aconfig/trunk_staging/android.view.contentprotection.flags/blocklist_update_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.contentprotection.flags"
-  name: "blocklist_update_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.contentprotection.flags/create_accessibility_overlay_app_op_enabled_flag_values.textproto b/aconfig/trunk_staging/android.view.contentprotection.flags/create_accessibility_overlay_app_op_enabled_flag_values.textproto
deleted file mode 100644
index 8c0fb4a6..00000000
--- a/aconfig/trunk_staging/android.view.contentprotection.flags/create_accessibility_overlay_app_op_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.contentprotection.flags"
-  name: "create_accessibility_overlay_app_op_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.contentprotection.flags/exported_settings_activity_enabled_flag_values.textproto b/aconfig/trunk_staging/android.view.contentprotection.flags/exported_settings_activity_enabled_flag_values.textproto
deleted file mode 100644
index 5ff4f0a4..00000000
--- a/aconfig/trunk_staging/android.view.contentprotection.flags/exported_settings_activity_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.contentprotection.flags"
-  name: "exported_settings_activity_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.contentprotection.flags/manage_device_policy_enabled_flag_values.textproto b/aconfig/trunk_staging/android.view.contentprotection.flags/manage_device_policy_enabled_flag_values.textproto
deleted file mode 100644
index 482f0c2d..00000000
--- a/aconfig/trunk_staging/android.view.contentprotection.flags/manage_device_policy_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.contentprotection.flags"
-  name: "manage_device_policy_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.contentprotection.flags/parse_groups_config_enabled_flag_values.textproto b/aconfig/trunk_staging/android.view.contentprotection.flags/parse_groups_config_enabled_flag_values.textproto
deleted file mode 100644
index 46a3b2dc..00000000
--- a/aconfig/trunk_staging/android.view.contentprotection.flags/parse_groups_config_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.contentprotection.flags"
-  name: "parse_groups_config_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.contentprotection.flags/rapid_clear_notifications_by_listener_app_op_enabled_flag_values.textproto b/aconfig/trunk_staging/android.view.contentprotection.flags/rapid_clear_notifications_by_listener_app_op_enabled_flag_values.textproto
deleted file mode 100644
index c4769cef..00000000
--- a/aconfig/trunk_staging/android.view.contentprotection.flags/rapid_clear_notifications_by_listener_app_op_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.contentprotection.flags"
-  name: "rapid_clear_notifications_by_listener_app_op_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.contentprotection.flags/setting_ui_enabled_flag_values.textproto b/aconfig/trunk_staging/android.view.contentprotection.flags/setting_ui_enabled_flag_values.textproto
deleted file mode 100644
index b565f86b..00000000
--- a/aconfig/trunk_staging/android.view.contentprotection.flags/setting_ui_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.contentprotection.flags"
-  name: "setting_ui_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.flags/Android.bp b/aconfig/trunk_staging/android.view.flags/Android.bp
deleted file mode 100644
index 0847a26d..00000000
--- a/aconfig/trunk_staging/android.view.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.view.flags-all",
-    package: "android.view.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.view.flags/add_schandle_to_vri_surface_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/add_schandle_to_vri_surface_flag_values.textproto
deleted file mode 100644
index bd218a40..00000000
--- a/aconfig/trunk_staging/android.view.flags/add_schandle_to_vri_surface_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "add_schandle_to_vri_surface"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/buffer_stuffing_recovery_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/buffer_stuffing_recovery_flag_values.textproto
deleted file mode 100644
index dbd1642f..00000000
--- a/aconfig/trunk_staging/android.view.flags/buffer_stuffing_recovery_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "buffer_stuffing_recovery"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/calculate_bounds_in_parent_from_bounds_in_screen_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/calculate_bounds_in_parent_from_bounds_in_screen_flag_values.textproto
deleted file mode 100644
index e222b334..00000000
--- a/aconfig/trunk_staging/android.view.flags/calculate_bounds_in_parent_from_bounds_in_screen_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "calculate_bounds_in_parent_from_bounds_in_screen"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/customizable_window_headers_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/customizable_window_headers_flag_values.textproto
deleted file mode 100644
index ab4b3597..00000000
--- a/aconfig/trunk_staging/android.view.flags/customizable_window_headers_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "customizable_window_headers"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/date_time_view_relative_time_display_configs_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/date_time_view_relative_time_display_configs_flag_values.textproto
deleted file mode 100644
index 096d9282..00000000
--- a/aconfig/trunk_staging/android.view.flags/date_time_view_relative_time_display_configs_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "date_time_view_relative_time_display_configs"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/deprecate_surface_view_z_order_apis_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/deprecate_surface_view_z_order_apis_flag_values.textproto
deleted file mode 100644
index 10010495..00000000
--- a/aconfig/trunk_staging/android.view.flags/deprecate_surface_view_z_order_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "deprecate_surface_view_z_order_apis"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/disable_draw_wake_lock_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/disable_draw_wake_lock_flag_values.textproto
deleted file mode 100644
index a27444db..00000000
--- a/aconfig/trunk_staging/android.view.flags/disable_draw_wake_lock_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "disable_draw_wake_lock"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/dynamic_view_rotary_haptics_configuration_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/dynamic_view_rotary_haptics_configuration_flag_values.textproto
deleted file mode 100644
index 41547e7a..00000000
--- a/aconfig/trunk_staging/android.view.flags/dynamic_view_rotary_haptics_configuration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "dynamic_view_rotary_haptics_configuration"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.flags/enable_arrow_icon_on_hover_when_clickable_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/enable_arrow_icon_on_hover_when_clickable_flag_values.textproto
deleted file mode 100644
index c7400de8..00000000
--- a/aconfig/trunk_staging/android.view.flags/enable_arrow_icon_on_hover_when_clickable_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "enable_arrow_icon_on_hover_when_clickable"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.flags/enable_dispatch_on_scroll_changed_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/enable_dispatch_on_scroll_changed_flag_values.textproto
deleted file mode 100644
index 2678b808..00000000
--- a/aconfig/trunk_staging/android.view.flags/enable_dispatch_on_scroll_changed_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "enable_dispatch_on_scroll_changed"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.flags/enable_scroll_feedback_for_touch_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/enable_scroll_feedback_for_touch_flag_values.textproto
deleted file mode 100644
index 58f5e080..00000000
--- a/aconfig/trunk_staging/android.view.flags/enable_scroll_feedback_for_touch_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "enable_scroll_feedback_for_touch"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/enable_surface_native_alloc_registration_ro_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/enable_surface_native_alloc_registration_ro_flag_values.textproto
deleted file mode 100644
index 73982118..00000000
--- a/aconfig/trunk_staging/android.view.flags/enable_surface_native_alloc_registration_ro_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "enable_surface_native_alloc_registration_ro"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/enable_vector_cursor_a11y_settings_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/enable_vector_cursor_a11y_settings_flag_values.textproto
deleted file mode 100644
index 6d5efde8..00000000
--- a/aconfig/trunk_staging/android.view.flags/enable_vector_cursor_a11y_settings_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "enable_vector_cursor_a11y_settings"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/enable_vector_cursors_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/enable_vector_cursors_flag_values.textproto
deleted file mode 100644
index 2d69e393..00000000
--- a/aconfig/trunk_staging/android.view.flags/enable_vector_cursors_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "enable_vector_cursors"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/root_view_changed_listener_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/root_view_changed_listener_flag_values.textproto
deleted file mode 100644
index 248aecd2..00000000
--- a/aconfig/trunk_staging/android.view.flags/root_view_changed_listener_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "root_view_changed_listener"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.flags/scroll_capture_relax_scroll_view_criteria_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/scroll_capture_relax_scroll_view_criteria_flag_values.textproto
deleted file mode 100644
index f0d88795..00000000
--- a/aconfig/trunk_staging/android.view.flags/scroll_capture_relax_scroll_view_criteria_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "scroll_capture_relax_scroll_view_criteria"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.flags/scroll_capture_target_z_order_fix_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/scroll_capture_target_z_order_fix_flag_values.textproto
deleted file mode 100644
index 7b757220..00000000
--- a/aconfig/trunk_staging/android.view.flags/scroll_capture_target_z_order_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "scroll_capture_target_z_order_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.flags/scroll_feedback_api_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/scroll_feedback_api_flag_values.textproto
deleted file mode 100644
index 09ba5998..00000000
--- a/aconfig/trunk_staging/android.view.flags/scroll_feedback_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "scroll_feedback_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.flags/sensitive_content_app_protection_api_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/sensitive_content_app_protection_api_flag_values.textproto
deleted file mode 100644
index dd70a366..00000000
--- a/aconfig/trunk_staging/android.view.flags/sensitive_content_app_protection_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "sensitive_content_app_protection_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.flags/sensitive_content_app_protection_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/sensitive_content_app_protection_flag_values.textproto
deleted file mode 100644
index dcdce437..00000000
--- a/aconfig/trunk_staging/android.view.flags/sensitive_content_app_protection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "sensitive_content_app_protection"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/sensitive_content_premature_protection_removed_fix_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/sensitive_content_premature_protection_removed_fix_flag_values.textproto
deleted file mode 100644
index 77b6b89b..00000000
--- a/aconfig/trunk_staging/android.view.flags/sensitive_content_premature_protection_removed_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "sensitive_content_premature_protection_removed_fix"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/surface_view_get_surface_package_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/surface_view_get_surface_package_flag_values.textproto
deleted file mode 100644
index ec44cb83..00000000
--- a/aconfig/trunk_staging/android.view.flags/surface_view_get_surface_package_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "surface_view_get_surface_package"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/surface_view_set_composition_order_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/surface_view_set_composition_order_flag_values.textproto
deleted file mode 100644
index 5e759f7c..00000000
--- a/aconfig/trunk_staging/android.view.flags/surface_view_set_composition_order_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "surface_view_set_composition_order"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/toolkit_frame_rate_animation_bugfix_25q1_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/toolkit_frame_rate_animation_bugfix_25q1_flag_values.textproto
deleted file mode 100644
index 0731b69a..00000000
--- a/aconfig/trunk_staging/android.view.flags/toolkit_frame_rate_animation_bugfix_25q1_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "toolkit_frame_rate_animation_bugfix_25q1"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/toolkit_frame_rate_default_normal_read_only_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/toolkit_frame_rate_default_normal_read_only_flag_values.textproto
deleted file mode 100644
index 09ed6a7d..00000000
--- a/aconfig/trunk_staging/android.view.flags/toolkit_frame_rate_default_normal_read_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "toolkit_frame_rate_default_normal_read_only"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/toolkit_frame_rate_function_enabling_read_only_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/toolkit_frame_rate_function_enabling_read_only_flag_values.textproto
deleted file mode 100644
index 6dbbd110..00000000
--- a/aconfig/trunk_staging/android.view.flags/toolkit_frame_rate_function_enabling_read_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "toolkit_frame_rate_function_enabling_read_only"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/toolkit_frame_rate_small_uses_percent_read_only_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/toolkit_frame_rate_small_uses_percent_read_only_flag_values.textproto
deleted file mode 100644
index d34a5814..00000000
--- a/aconfig/trunk_staging/android.view.flags/toolkit_frame_rate_small_uses_percent_read_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "toolkit_frame_rate_small_uses_percent_read_only"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/toolkit_frame_rate_typing_read_only_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/toolkit_frame_rate_typing_read_only_flag_values.textproto
deleted file mode 100644
index 972170a4..00000000
--- a/aconfig/trunk_staging/android.view.flags/toolkit_frame_rate_typing_read_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "toolkit_frame_rate_typing_read_only"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/toolkit_frame_rate_velocity_mapping_read_only_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/toolkit_frame_rate_velocity_mapping_read_only_flag_values.textproto
deleted file mode 100644
index dbe6f502..00000000
--- a/aconfig/trunk_staging/android.view.flags/toolkit_frame_rate_velocity_mapping_read_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "toolkit_frame_rate_velocity_mapping_read_only"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/toolkit_frame_rate_view_enabling_read_only_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/toolkit_frame_rate_view_enabling_read_only_flag_values.textproto
deleted file mode 100644
index 572c7b04..00000000
--- a/aconfig/trunk_staging/android.view.flags/toolkit_frame_rate_view_enabling_read_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "toolkit_frame_rate_view_enabling_read_only"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/toolkit_initial_touch_boost_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/toolkit_initial_touch_boost_flag_values.textproto
deleted file mode 100644
index c073b2d6..00000000
--- a/aconfig/trunk_staging/android.view.flags/toolkit_initial_touch_boost_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "toolkit_initial_touch_boost"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.flags/toolkit_set_frame_rate_read_only_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/toolkit_set_frame_rate_read_only_flag_values.textproto
deleted file mode 100644
index 72b10bcc..00000000
--- a/aconfig/trunk_staging/android.view.flags/toolkit_set_frame_rate_read_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "toolkit_set_frame_rate_read_only"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/toolkit_viewgroup_set_requested_frame_rate_api_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/toolkit_viewgroup_set_requested_frame_rate_api_flag_values.textproto
deleted file mode 100644
index ef7b1a93..00000000
--- a/aconfig/trunk_staging/android.view.flags/toolkit_viewgroup_set_requested_frame_rate_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "toolkit_viewgroup_set_requested_frame_rate_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/use_refactored_round_scrollbar_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/use_refactored_round_scrollbar_flag_values.textproto
deleted file mode 100644
index ac2d2d8d..00000000
--- a/aconfig/trunk_staging/android.view.flags/use_refactored_round_scrollbar_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "use_refactored_round_scrollbar"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.flags/use_view_based_rotary_encoder_scroll_haptics_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/use_view_based_rotary_encoder_scroll_haptics_flag_values.textproto
deleted file mode 100644
index 571bb4ba..00000000
--- a/aconfig/trunk_staging/android.view.flags/use_view_based_rotary_encoder_scroll_haptics_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "use_view_based_rotary_encoder_scroll_haptics"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.flags/view_velocity_api_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/view_velocity_api_flag_values.textproto
deleted file mode 100644
index 2489f000..00000000
--- a/aconfig/trunk_staging/android.view.flags/view_velocity_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "view_velocity_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/Android.bp b/aconfig/trunk_staging/android.view.inputmethod/Android.bp
deleted file mode 100644
index 598ae21b..00000000
--- a/aconfig/trunk_staging/android.view.inputmethod/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.view.inputmethod-all",
-    package: "android.view.inputmethod",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/TEST_MAPPING b/aconfig/trunk_staging/android.view.inputmethod/TEST_MAPPING
deleted file mode 100644
index 84f31fae..00000000
--- a/aconfig/trunk_staging/android.view.inputmethod/TEST_MAPPING
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "imports": [
-    {
-      "path": "frameworks/base/services/core/java/com/android/server/inputmethod"
-    }
-  ]
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/adaptive_handwriting_bounds_flag_values.textproto b/aconfig/trunk_staging/android.view.inputmethod/adaptive_handwriting_bounds_flag_values.textproto
deleted file mode 100644
index 6297ae2e..00000000
--- a/aconfig/trunk_staging/android.view.inputmethod/adaptive_handwriting_bounds_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.inputmethod"
-  name: "adaptive_handwriting_bounds"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/compatchange_for_zerojankproxy_flag_values.textproto b/aconfig/trunk_staging/android.view.inputmethod/compatchange_for_zerojankproxy_flag_values.textproto
deleted file mode 100644
index e68f1650..00000000
--- a/aconfig/trunk_staging/android.view.inputmethod/compatchange_for_zerojankproxy_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.inputmethod"
-  name: "compatchange_for_zerojankproxy"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/concurrent_input_methods_flag_values.textproto b/aconfig/trunk_staging/android.view.inputmethod/concurrent_input_methods_flag_values.textproto
deleted file mode 100644
index 3879f7fa..00000000
--- a/aconfig/trunk_staging/android.view.inputmethod/concurrent_input_methods_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.inputmethod"
-  name: "concurrent_input_methods"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/connectionless_handwriting_flag_values.textproto b/aconfig/trunk_staging/android.view.inputmethod/connectionless_handwriting_flag_values.textproto
deleted file mode 100644
index 37e5a7ba..00000000
--- a/aconfig/trunk_staging/android.view.inputmethod/connectionless_handwriting_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.inputmethod"
-  name: "connectionless_handwriting"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/consistent_get_current_input_method_info_flag_values.textproto b/aconfig/trunk_staging/android.view.inputmethod/consistent_get_current_input_method_info_flag_values.textproto
deleted file mode 100644
index 40fd467d..00000000
--- a/aconfig/trunk_staging/android.view.inputmethod/consistent_get_current_input_method_info_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.inputmethod"
-  name: "consistent_get_current_input_method_info"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/defer_show_soft_input_until_session_creation_flag_values.textproto b/aconfig/trunk_staging/android.view.inputmethod/defer_show_soft_input_until_session_creation_flag_values.textproto
deleted file mode 100644
index fdd8707f..00000000
--- a/aconfig/trunk_staging/android.view.inputmethod/defer_show_soft_input_until_session_creation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.inputmethod"
-  name: "defer_show_soft_input_until_session_creation"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/disallow_disabling_ime_navigation_bar_flag_values.textproto b/aconfig/trunk_staging/android.view.inputmethod/disallow_disabling_ime_navigation_bar_flag_values.textproto
deleted file mode 100644
index ba742682..00000000
--- a/aconfig/trunk_staging/android.view.inputmethod/disallow_disabling_ime_navigation_bar_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.inputmethod"
-  name: "disallow_disabling_ime_navigation_bar"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/editorinfo_handwriting_enabled_flag_values.textproto b/aconfig/trunk_staging/android.view.inputmethod/editorinfo_handwriting_enabled_flag_values.textproto
deleted file mode 100644
index ff178885..00000000
--- a/aconfig/trunk_staging/android.view.inputmethod/editorinfo_handwriting_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.inputmethod"
-  name: "editorinfo_handwriting_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/fallback_display_for_secondary_user_on_secondary_display_flag_values.textproto b/aconfig/trunk_staging/android.view.inputmethod/fallback_display_for_secondary_user_on_secondary_display_flag_values.textproto
deleted file mode 100644
index f59f66f1..00000000
--- a/aconfig/trunk_staging/android.view.inputmethod/fallback_display_for_secondary_user_on_secondary_display_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.inputmethod"
-  name: "fallback_display_for_secondary_user_on_secondary_display"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/home_screen_handwriting_delegator_flag_values.textproto b/aconfig/trunk_staging/android.view.inputmethod/home_screen_handwriting_delegator_flag_values.textproto
deleted file mode 100644
index 89fd4218..00000000
--- a/aconfig/trunk_staging/android.view.inputmethod/home_screen_handwriting_delegator_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.inputmethod"
-  name: "home_screen_handwriting_delegator"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/ime_switcher_revamp_api_flag_values.textproto b/aconfig/trunk_staging/android.view.inputmethod/ime_switcher_revamp_api_flag_values.textproto
deleted file mode 100644
index 71efeff4..00000000
--- a/aconfig/trunk_staging/android.view.inputmethod/ime_switcher_revamp_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.inputmethod"
-  name: "ime_switcher_revamp_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/ime_switcher_revamp_flag_values.textproto b/aconfig/trunk_staging/android.view.inputmethod/ime_switcher_revamp_flag_values.textproto
deleted file mode 100644
index b98792f9..00000000
--- a/aconfig/trunk_staging/android.view.inputmethod/ime_switcher_revamp_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.inputmethod"
-  name: "ime_switcher_revamp"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/imm_userhandle_hostsidetests_flag_values.textproto b/aconfig/trunk_staging/android.view.inputmethod/imm_userhandle_hostsidetests_flag_values.textproto
deleted file mode 100644
index 75cad217..00000000
--- a/aconfig/trunk_staging/android.view.inputmethod/imm_userhandle_hostsidetests_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.inputmethod"
-  name: "imm_userhandle_hostsidetests"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/initiation_without_input_connection_flag_values.textproto b/aconfig/trunk_staging/android.view.inputmethod/initiation_without_input_connection_flag_values.textproto
deleted file mode 100644
index dfdec799..00000000
--- a/aconfig/trunk_staging/android.view.inputmethod/initiation_without_input_connection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.inputmethod"
-  name: "initiation_without_input_connection"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/predictive_back_ime_flag_values.textproto b/aconfig/trunk_staging/android.view.inputmethod/predictive_back_ime_flag_values.textproto
deleted file mode 100644
index 6b1acff1..00000000
--- a/aconfig/trunk_staging/android.view.inputmethod/predictive_back_ime_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.inputmethod"
-  name: "predictive_back_ime"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/public_autofill_id_in_editorinfo_flag_values.textproto b/aconfig/trunk_staging/android.view.inputmethod/public_autofill_id_in_editorinfo_flag_values.textproto
deleted file mode 100644
index 3bb72814..00000000
--- a/aconfig/trunk_staging/android.view.inputmethod/public_autofill_id_in_editorinfo_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.inputmethod"
-  name: "public_autofill_id_in_editorinfo"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/refactor_insets_controller_flag_values.textproto b/aconfig/trunk_staging/android.view.inputmethod/refactor_insets_controller_flag_values.textproto
deleted file mode 100644
index 997265f4..00000000
--- a/aconfig/trunk_staging/android.view.inputmethod/refactor_insets_controller_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.inputmethod"
-  name: "refactor_insets_controller"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/use_handwriting_listener_for_tooltype_flag_values.textproto b/aconfig/trunk_staging/android.view.inputmethod/use_handwriting_listener_for_tooltype_flag_values.textproto
deleted file mode 100644
index 2be8bb56..00000000
--- a/aconfig/trunk_staging/android.view.inputmethod/use_handwriting_listener_for_tooltype_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.inputmethod"
-  name: "use_handwriting_listener_for_tooltype"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/use_input_method_info_safe_list_flag_values.textproto b/aconfig/trunk_staging/android.view.inputmethod/use_input_method_info_safe_list_flag_values.textproto
deleted file mode 100644
index 6b7064e5..00000000
--- a/aconfig/trunk_staging/android.view.inputmethod/use_input_method_info_safe_list_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.inputmethod"
-  name: "use_input_method_info_safe_list"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/use_zero_jank_proxy_flag_values.textproto b/aconfig/trunk_staging/android.view.inputmethod/use_zero_jank_proxy_flag_values.textproto
deleted file mode 100644
index 81836b8a..00000000
--- a/aconfig/trunk_staging/android.view.inputmethod/use_zero_jank_proxy_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.inputmethod"
-  name: "use_zero_jank_proxy"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/verify_key_event_flag_values.textproto b/aconfig/trunk_staging/android.view.inputmethod/verify_key_event_flag_values.textproto
deleted file mode 100644
index 4d7ec925..00000000
--- a/aconfig/trunk_staging/android.view.inputmethod/verify_key_event_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.inputmethod"
-  name: "verify_key_event"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/writing_tools_flag_values.textproto b/aconfig/trunk_staging/android.view.inputmethod/writing_tools_flag_values.textproto
deleted file mode 100644
index ac6e8ab8..00000000
--- a/aconfig/trunk_staging/android.view.inputmethod/writing_tools_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.inputmethod"
-  name: "writing_tools"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.vold.flags/Android.bp b/aconfig/trunk_staging/android.vold.flags/Android.bp
deleted file mode 100644
index b6792537..00000000
--- a/aconfig/trunk_staging/android.vold.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.vold.flags-all",
-    package: "android.vold.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.vold.flags/enhance_fuse_unmount_flag_values.textproto b/aconfig/trunk_staging/android.vold.flags/enhance_fuse_unmount_flag_values.textproto
deleted file mode 100644
index 40160496..00000000
--- a/aconfig/trunk_staging/android.vold.flags/enhance_fuse_unmount_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.vold.flags"
-  name: "enhance_fuse_unmount"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.webkit/Android.bp b/aconfig/trunk_staging/android.webkit/Android.bp
deleted file mode 100644
index 4d2af99c..00000000
--- a/aconfig/trunk_staging/android.webkit/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.webkit-all",
-    package: "android.webkit",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.webkit/deprecate_start_safe_browsing_flag_values.textproto b/aconfig/trunk_staging/android.webkit/deprecate_start_safe_browsing_flag_values.textproto
deleted file mode 100644
index 0e599cef..00000000
--- a/aconfig/trunk_staging/android.webkit/deprecate_start_safe_browsing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.webkit"
-  name: "deprecate_start_safe_browsing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.webkit/file_system_access_flag_values.textproto b/aconfig/trunk_staging/android.webkit/file_system_access_flag_values.textproto
deleted file mode 100644
index 442f1e09..00000000
--- a/aconfig/trunk_staging/android.webkit/file_system_access_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.webkit"
-  name: "file_system_access"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.webkit/update_service_ipc_wrapper_flag_values.textproto b/aconfig/trunk_staging/android.webkit/update_service_ipc_wrapper_flag_values.textproto
deleted file mode 100644
index 95330a8f..00000000
--- a/aconfig/trunk_staging/android.webkit/update_service_ipc_wrapper_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.webkit"
-  name: "update_service_ipc_wrapper"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.webkit/update_service_v2_flag_values.textproto b/aconfig/trunk_staging/android.webkit/update_service_v2_flag_values.textproto
deleted file mode 100644
index 088c0f9e..00000000
--- a/aconfig/trunk_staging/android.webkit/update_service_v2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.webkit"
-  name: "update_service_v2"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.widget.flags/Android.bp b/aconfig/trunk_staging/android.widget.flags/Android.bp
deleted file mode 100644
index 09bbadb5..00000000
--- a/aconfig/trunk_staging/android.widget.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-android.widget.flags-all",
-    package: "android.widget.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/android.widget.flags/big_picture_style_discard_empty_icon_bitmap_drawables_flag_values.textproto b/aconfig/trunk_staging/android.widget.flags/big_picture_style_discard_empty_icon_bitmap_drawables_flag_values.textproto
deleted file mode 100644
index b769f76e..00000000
--- a/aconfig/trunk_staging/android.widget.flags/big_picture_style_discard_empty_icon_bitmap_drawables_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.widget.flags"
-  name: "big_picture_style_discard_empty_icon_bitmap_drawables"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.widget.flags/call_style_set_data_async_flag_values.textproto b/aconfig/trunk_staging/android.widget.flags/call_style_set_data_async_flag_values.textproto
deleted file mode 100644
index b058dd6b..00000000
--- a/aconfig/trunk_staging/android.widget.flags/call_style_set_data_async_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.widget.flags"
-  name: "call_style_set_data_async"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.widget.flags/conversation_layout_use_maximum_child_height_flag_values.textproto b/aconfig/trunk_staging/android.widget.flags/conversation_layout_use_maximum_child_height_flag_values.textproto
deleted file mode 100644
index 111da1c9..00000000
--- a/aconfig/trunk_staging/android.widget.flags/conversation_layout_use_maximum_child_height_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.widget.flags"
-  name: "conversation_layout_use_maximum_child_height"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.widget.flags/conversation_style_set_avatar_async_flag_values.textproto b/aconfig/trunk_staging/android.widget.flags/conversation_style_set_avatar_async_flag_values.textproto
deleted file mode 100644
index abc09a5d..00000000
--- a/aconfig/trunk_staging/android.widget.flags/conversation_style_set_avatar_async_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.widget.flags"
-  name: "conversation_style_set_avatar_async"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.widget.flags/drop_non_existing_messages_flag_values.textproto b/aconfig/trunk_staging/android.widget.flags/drop_non_existing_messages_flag_values.textproto
deleted file mode 100644
index fcf1487a..00000000
--- a/aconfig/trunk_staging/android.widget.flags/drop_non_existing_messages_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.widget.flags"
-  name: "drop_non_existing_messages"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.widget.flags/enable_fading_view_group_flag_values.textproto b/aconfig/trunk_staging/android.widget.flags/enable_fading_view_group_flag_values.textproto
deleted file mode 100644
index 4691526b..00000000
--- a/aconfig/trunk_staging/android.widget.flags/enable_fading_view_group_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.widget.flags"
-  name: "enable_fading_view_group"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.widget.flags/enable_platform_widget_differential_motion_fling_flag_values.textproto b/aconfig/trunk_staging/android.widget.flags/enable_platform_widget_differential_motion_fling_flag_values.textproto
deleted file mode 100644
index 2df1b720..00000000
--- a/aconfig/trunk_staging/android.widget.flags/enable_platform_widget_differential_motion_fling_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.widget.flags"
-  name: "enable_platform_widget_differential_motion_fling"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.widget.flags/fix_unbolded_typeface_for_numberpicker_flag_values.textproto b/aconfig/trunk_staging/android.widget.flags/fix_unbolded_typeface_for_numberpicker_flag_values.textproto
deleted file mode 100644
index d42a9265..00000000
--- a/aconfig/trunk_staging/android.widget.flags/fix_unbolded_typeface_for_numberpicker_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.widget.flags"
-  name: "fix_unbolded_typeface_for_numberpicker"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.widget.flags/messaging_child_request_layout_flag_values.textproto b/aconfig/trunk_staging/android.widget.flags/messaging_child_request_layout_flag_values.textproto
deleted file mode 100644
index 15588605..00000000
--- a/aconfig/trunk_staging/android.widget.flags/messaging_child_request_layout_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.widget.flags"
-  name: "messaging_child_request_layout"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.widget.flags/notif_linearlayout_optimized_flag_values.textproto b/aconfig/trunk_staging/android.widget.flags/notif_linearlayout_optimized_flag_values.textproto
deleted file mode 100644
index 744b7b90..00000000
--- a/aconfig/trunk_staging/android.widget.flags/notif_linearlayout_optimized_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.widget.flags"
-  name: "notif_linearlayout_optimized"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.widget.flags/toast_no_weakref_flag_values.textproto b/aconfig/trunk_staging/android.widget.flags/toast_no_weakref_flag_values.textproto
deleted file mode 100644
index 27082df5..00000000
--- a/aconfig/trunk_staging/android.widget.flags/toast_no_weakref_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.widget.flags"
-  name: "toast_no_weakref"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.widget.flags/use_wear_material3_ui_flag_values.textproto b/aconfig/trunk_staging/android.widget.flags/use_wear_material3_ui_flag_values.textproto
deleted file mode 100644
index 9bbc7ff1..00000000
--- a/aconfig/trunk_staging/android.widget.flags/use_wear_material3_ui_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.widget.flags"
-  name: "use_wear_material3_ui"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.aconfig.flags/Android.bp b/aconfig/trunk_staging/com.android.aconfig.flags/Android.bp
deleted file mode 100644
index 8a7d875f..00000000
--- a/aconfig/trunk_staging/com.android.aconfig.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.aconfig.flags-all",
-    package: "com.android.aconfig.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.aconfig.flags/enable_only_new_storage_flag_values.textproto b/aconfig/trunk_staging/com.android.aconfig.flags/enable_only_new_storage_flag_values.textproto
deleted file mode 100644
index 61cb32d7..00000000
--- a/aconfig/trunk_staging/com.android.aconfig.flags/enable_only_new_storage_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.aconfig.flags"
-  name: "enable_only_new_storage"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.aconfig.flags/enable_system_aconfigd_rust_flag_values.textproto b/aconfig/trunk_staging/com.android.aconfig.flags/enable_system_aconfigd_rust_flag_values.textproto
deleted file mode 100644
index 776c5d9a..00000000
--- a/aconfig/trunk_staging/com.android.aconfig.flags/enable_system_aconfigd_rust_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.aconfig.flags"
-  name: "enable_system_aconfigd_rust"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.aconfig.flags/invoke_updatable_aflags_flag_values.textproto b/aconfig/trunk_staging/com.android.aconfig.flags/invoke_updatable_aflags_flag_values.textproto
deleted file mode 100644
index 3759a952..00000000
--- a/aconfig/trunk_staging/com.android.aconfig.flags/invoke_updatable_aflags_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.aconfig.flags"
-  name: "invoke_updatable_aflags"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.aconfig.flags/tools_read_from_new_storage_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.aconfig.flags/tools_read_from_new_storage_bugfix_flag_values.textproto
deleted file mode 100644
index e51dee47..00000000
--- a/aconfig/trunk_staging/com.android.aconfig.flags/tools_read_from_new_storage_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.aconfig.flags"
-  name: "tools_read_from_new_storage_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.aconfig.flags/tools_read_from_new_storage_flag_values.textproto b/aconfig/trunk_staging/com.android.aconfig.flags/tools_read_from_new_storage_flag_values.textproto
deleted file mode 100644
index 2055f526..00000000
--- a/aconfig/trunk_staging/com.android.aconfig.flags/tools_read_from_new_storage_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.aconfig.flags"
-  name: "tools_read_from_new_storage"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.aconfig.test/Android.bp b/aconfig/trunk_staging/com.android.aconfig.test/Android.bp
deleted file mode 100644
index cfb5cd6e..00000000
--- a/aconfig/trunk_staging/com.android.aconfig.test/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.aconfig.test-all",
-  package: "com.android.aconfig.test",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.aconfig.test/enabled_fixed_ro_exported_flag_values.textproto b/aconfig/trunk_staging/com.android.aconfig.test/enabled_fixed_ro_exported_flag_values.textproto
deleted file mode 100644
index 1ff36d09..00000000
--- a/aconfig/trunk_staging/com.android.aconfig.test/enabled_fixed_ro_exported_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.aconfig.test"
-  name: "enabled_fixed_ro_exported"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.aconfig.test/enabled_fixed_ro_flag_values.textproto b/aconfig/trunk_staging/com.android.aconfig.test/enabled_fixed_ro_flag_values.textproto
deleted file mode 100644
index 342cf858..00000000
--- a/aconfig/trunk_staging/com.android.aconfig.test/enabled_fixed_ro_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.aconfig.test"
-  name: "enabled_fixed_ro"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.aconfig.test/enabled_ro_exported_flag_values.textproto b/aconfig/trunk_staging/com.android.aconfig.test/enabled_ro_exported_flag_values.textproto
deleted file mode 100644
index 409b4598..00000000
--- a/aconfig/trunk_staging/com.android.aconfig.test/enabled_ro_exported_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.aconfig.test"
-  name: "enabled_ro_exported"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.aconfig.test/enabled_ro_flag_values.textproto b/aconfig/trunk_staging/com.android.aconfig.test/enabled_ro_flag_values.textproto
deleted file mode 100644
index 139a6362..00000000
--- a/aconfig/trunk_staging/com.android.aconfig.test/enabled_ro_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.aconfig.test"
-  name: "enabled_ro"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.aconfig.test/enabled_rw_flag_values.textproto b/aconfig/trunk_staging/com.android.aconfig.test/enabled_rw_flag_values.textproto
deleted file mode 100644
index 22adf049..00000000
--- a/aconfig/trunk_staging/com.android.aconfig.test/enabled_rw_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.aconfig.test"
-  name: "enabled_rw"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.aconfig_new_storage/Android.bp b/aconfig/trunk_staging/com.android.aconfig_new_storage/Android.bp
deleted file mode 100644
index 7e037e66..00000000
--- a/aconfig/trunk_staging/com.android.aconfig_new_storage/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.aconfig_new_storage-all",
-    package: "com.android.aconfig_new_storage",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.aconfig_new_storage/bluetooth_flag_value_bug_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.aconfig_new_storage/bluetooth_flag_value_bug_fix_flag_values.textproto
deleted file mode 100644
index bab9e8bb..00000000
--- a/aconfig/trunk_staging/com.android.aconfig_new_storage/bluetooth_flag_value_bug_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.aconfig_new_storage"
-  name: "bluetooth_flag_value_bug_fix"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.aconfig_new_storage/enable_aconfig_storage_daemon_flag_values.textproto b/aconfig/trunk_staging/com.android.aconfig_new_storage/enable_aconfig_storage_daemon_flag_values.textproto
deleted file mode 100644
index 29b3fd67..00000000
--- a/aconfig/trunk_staging/com.android.aconfig_new_storage/enable_aconfig_storage_daemon_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.aconfig_new_storage"
-  name: "enable_aconfig_storage_daemon"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.aconfig_new_storage/enable_aconfigd_from_mainline_flag_values.textproto b/aconfig/trunk_staging/com.android.aconfig_new_storage/enable_aconfigd_from_mainline_flag_values.textproto
deleted file mode 100644
index 64682f42..00000000
--- a/aconfig/trunk_staging/com.android.aconfig_new_storage/enable_aconfigd_from_mainline_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.aconfig_new_storage"
-  name: "enable_aconfigd_from_mainline"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.aconfig_new_storage/enable_full_rust_system_aconfigd_flag_values.textproto b/aconfig/trunk_staging/com.android.aconfig_new_storage/enable_full_rust_system_aconfigd_flag_values.textproto
deleted file mode 100644
index 3c8fab06..00000000
--- a/aconfig/trunk_staging/com.android.aconfig_new_storage/enable_full_rust_system_aconfigd_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.aconfig_new_storage"
-  name: "enable_full_rust_system_aconfigd"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.aconfig_new_storage/support_clear_local_overrides_immediately_flag_values.textproto b/aconfig/trunk_staging/com.android.aconfig_new_storage/support_clear_local_overrides_immediately_flag_values.textproto
deleted file mode 100644
index 8cf0a646..00000000
--- a/aconfig/trunk_staging/com.android.aconfig_new_storage/support_clear_local_overrides_immediately_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.aconfig_new_storage"
-  name: "support_clear_local_overrides_immediately"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.aconfig_new_storage/support_immediate_local_overrides_flag_values.textproto b/aconfig/trunk_staging/com.android.aconfig_new_storage/support_immediate_local_overrides_flag_values.textproto
deleted file mode 100644
index 49dbb353..00000000
--- a/aconfig/trunk_staging/com.android.aconfig_new_storage/support_immediate_local_overrides_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.aconfig_new_storage"
-  name: "support_immediate_local_overrides"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.flags/Android.bp b/aconfig/trunk_staging/com.android.adservices.flags/Android.bp
deleted file mode 100644
index 74e9630f..00000000
--- a/aconfig/trunk_staging/com.android.adservices.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.adservices.flags-all",
-    package: "com.android.adservices.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.flags/ad_id_cache_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.flags/ad_id_cache_enabled_flag_values.textproto
deleted file mode 100644
index 9e35a85d..00000000
--- a/aconfig/trunk_staging/com.android.adservices.flags/ad_id_cache_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.flags"
-  name: "ad_id_cache_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.flags/adext_data_service_apis_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.flags/adext_data_service_apis_enabled_flag_values.textproto
deleted file mode 100644
index 23f284e2..00000000
--- a/aconfig/trunk_staging/com.android.adservices.flags/adext_data_service_apis_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.flags"
-  name: "adext_data_service_apis_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.flags/adservices_enable_per_module_overrides_api_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.flags/adservices_enable_per_module_overrides_api_flag_values.textproto
deleted file mode 100644
index cf3d429a..00000000
--- a/aconfig/trunk_staging/com.android.adservices.flags/adservices_enable_per_module_overrides_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.flags"
-  name: "adservices_enable_per_module_overrides_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.flags/adservices_enablement_check_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.flags/adservices_enablement_check_enabled_flag_values.textproto
deleted file mode 100644
index 8bff3dfe..00000000
--- a/aconfig/trunk_staging/com.android.adservices.flags/adservices_enablement_check_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.flags"
-  name: "adservices_enablement_check_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.flags/adservices_outcomereceiver_r_api_deprecated_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.flags/adservices_outcomereceiver_r_api_deprecated_flag_values.textproto
deleted file mode 100644
index 146b2540..00000000
--- a/aconfig/trunk_staging/com.android.adservices.flags/adservices_outcomereceiver_r_api_deprecated_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.flags"
-  name: "adservices_outcomereceiver_r_api_deprecated"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.flags/adservices_outcomereceiver_r_api_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.flags/adservices_outcomereceiver_r_api_enabled_flag_values.textproto
deleted file mode 100644
index d32e1e5b..00000000
--- a/aconfig/trunk_staging/com.android.adservices.flags/adservices_outcomereceiver_r_api_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.flags"
-  name: "adservices_outcomereceiver_r_api_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.flags/enable_adservices_api_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.flags/enable_adservices_api_enabled_flag_values.textproto
deleted file mode 100644
index e7860240..00000000
--- a/aconfig/trunk_staging/com.android.adservices.flags/enable_adservices_api_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.flags"
-  name: "enable_adservices_api_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.flags/fledge_ad_selection_filtering_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.flags/fledge_ad_selection_filtering_enabled_flag_values.textproto
deleted file mode 100644
index 463fda97..00000000
--- a/aconfig/trunk_staging/com.android.adservices.flags/fledge_ad_selection_filtering_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.flags"
-  name: "fledge_ad_selection_filtering_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.flags/fledge_auction_server_get_ad_selection_data_id_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.flags/fledge_auction_server_get_ad_selection_data_id_enabled_flag_values.textproto
deleted file mode 100644
index 502941ab..00000000
--- a/aconfig/trunk_staging/com.android.adservices.flags/fledge_auction_server_get_ad_selection_data_id_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.flags"
-  name: "fledge_auction_server_get_ad_selection_data_id_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.flags/fledge_custom_audience_auction_server_request_flags_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.flags/fledge_custom_audience_auction_server_request_flags_enabled_flag_values.textproto
deleted file mode 100644
index 2f9fda99..00000000
--- a/aconfig/trunk_staging/com.android.adservices.flags/fledge_custom_audience_auction_server_request_flags_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.flags"
-  name: "fledge_custom_audience_auction_server_request_flags_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.flags/fledge_enable_custom_audience_component_ads_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.flags/fledge_enable_custom_audience_component_ads_flag_values.textproto
deleted file mode 100644
index 206d8fff..00000000
--- a/aconfig/trunk_staging/com.android.adservices.flags/fledge_enable_custom_audience_component_ads_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.flags"
-  name: "fledge_enable_custom_audience_component_ads"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.flags/fledge_enable_report_event_for_component_seller_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.flags/fledge_enable_report_event_for_component_seller_flag_values.textproto
deleted file mode 100644
index 018c1aec..00000000
--- a/aconfig/trunk_staging/com.android.adservices.flags/fledge_enable_report_event_for_component_seller_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.flags"
-  name: "fledge_enable_report_event_for_component_seller"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.flags/fledge_enable_schedule_custom_audience_default_partial_custom_audiences_constructor_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.flags/fledge_enable_schedule_custom_audience_default_partial_custom_audiences_constructor_flag_values.textproto
deleted file mode 100644
index 61310580..00000000
--- a/aconfig/trunk_staging/com.android.adservices.flags/fledge_enable_schedule_custom_audience_default_partial_custom_audiences_constructor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.flags"
-  name: "fledge_enable_schedule_custom_audience_default_partial_custom_audiences_constructor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.flags/fledge_enable_winning_seller_id_in_ad_selection_outcome_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.flags/fledge_enable_winning_seller_id_in_ad_selection_outcome_flag_values.textproto
deleted file mode 100644
index ce8a3e4f..00000000
--- a/aconfig/trunk_staging/com.android.adservices.flags/fledge_enable_winning_seller_id_in_ad_selection_outcome_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.flags"
-  name: "fledge_enable_winning_seller_id_in_ad_selection_outcome"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.flags/fledge_server_auction_multi_cloud_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.flags/fledge_server_auction_multi_cloud_enabled_flag_values.textproto
deleted file mode 100644
index 69ce304b..00000000
--- a/aconfig/trunk_staging/com.android.adservices.flags/fledge_server_auction_multi_cloud_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.flags"
-  name: "fledge_server_auction_multi_cloud_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.flags/protected_signals_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.flags/protected_signals_enabled_flag_values.textproto
deleted file mode 100644
index 05f85ece..00000000
--- a/aconfig/trunk_staging/com.android.adservices.flags/protected_signals_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.flags"
-  name: "protected_signals_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.flags/sdksandbox_dump_effective_target_sdk_version_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.flags/sdksandbox_dump_effective_target_sdk_version_flag_values.textproto
deleted file mode 100644
index c6e9644e..00000000
--- a/aconfig/trunk_staging/com.android.adservices.flags/sdksandbox_dump_effective_target_sdk_version_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.flags"
-  name: "sdksandbox_dump_effective_target_sdk_version"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.flags/sdksandbox_invalidate_effective_target_sdk_version_cache_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.flags/sdksandbox_invalidate_effective_target_sdk_version_cache_flag_values.textproto
deleted file mode 100644
index 6b5910cc..00000000
--- a/aconfig/trunk_staging/com.android.adservices.flags/sdksandbox_invalidate_effective_target_sdk_version_cache_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.flags"
-  name: "sdksandbox_invalidate_effective_target_sdk_version_cache"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.flags/sdksandbox_use_effective_target_sdk_version_for_restrictions_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.flags/sdksandbox_use_effective_target_sdk_version_for_restrictions_flag_values.textproto
deleted file mode 100644
index 9caa9029..00000000
--- a/aconfig/trunk_staging/com.android.adservices.flags/sdksandbox_use_effective_target_sdk_version_for_restrictions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.flags"
-  name: "sdksandbox_use_effective_target_sdk_version_for_restrictions"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.flags/topics_encryption_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.flags/topics_encryption_enabled_flag_values.textproto
deleted file mode 100644
index 4086aa5b..00000000
--- a/aconfig/trunk_staging/com.android.adservices.flags/topics_encryption_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.flags"
-  name: "topics_encryption_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/Android.bp b/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/Android.bp
deleted file mode 100644
index 081a20f1..00000000
--- a/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.adservices.ondevicepersonalization.flags-all",
-    package: "com.android.adservices.ondevicepersonalization.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/data_class_missing_ctors_and_getters_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/data_class_missing_ctors_and_getters_enabled_flag_values.textproto
deleted file mode 100644
index edaa9533..00000000
--- a/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/data_class_missing_ctors_and_getters_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.ondevicepersonalization.flags"
-  name: "data_class_missing_ctors_and_getters_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/execute_in_isolated_service_api_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/execute_in_isolated_service_api_enabled_flag_values.textproto
deleted file mode 100644
index 1162590e..00000000
--- a/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/execute_in_isolated_service_api_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.ondevicepersonalization.flags"
-  name: "execute_in_isolated_service_api_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/executorch_inference_api_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/executorch_inference_api_enabled_flag_values.textproto
deleted file mode 100644
index 363d6709..00000000
--- a/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/executorch_inference_api_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.ondevicepersonalization.flags"
-  name: "executorch_inference_api_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/fcp_model_version_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/fcp_model_version_enabled_flag_values.textproto
deleted file mode 100644
index ae9b289d..00000000
--- a/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/fcp_model_version_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.ondevicepersonalization.flags"
-  name: "fcp_model_version_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/fcp_schedule_with_outcome_receiver_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/fcp_schedule_with_outcome_receiver_enabled_flag_values.textproto
deleted file mode 100644
index 003c07e6..00000000
--- a/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/fcp_schedule_with_outcome_receiver_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.ondevicepersonalization.flags"
-  name: "fcp_schedule_with_outcome_receiver_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/is_feature_enabled_api_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/is_feature_enabled_api_enabled_flag_values.textproto
deleted file mode 100644
index 65fab2be..00000000
--- a/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/is_feature_enabled_api_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.ondevicepersonalization.flags"
-  name: "is_feature_enabled_api_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/on_device_personalization_apis_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/on_device_personalization_apis_enabled_flag_values.textproto
deleted file mode 100644
index 8de524a3..00000000
--- a/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/on_device_personalization_apis_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.ondevicepersonalization.flags"
-  name: "on_device_personalization_apis_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/unhidden_on_device_personalization_exception_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/unhidden_on_device_personalization_exception_enabled_flag_values.textproto
deleted file mode 100644
index 9bb7ec07..00000000
--- a/aconfig/trunk_staging/com.android.adservices.ondevicepersonalization.flags/unhidden_on_device_personalization_exception_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.adservices.ondevicepersonalization.flags"
-  name: "unhidden_on_device_personalization_exception_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.apex.flags/Android.bp b/aconfig/trunk_staging/com.android.apex.flags/Android.bp
deleted file mode 100644
index 15faa1ef..00000000
--- a/aconfig/trunk_staging/com.android.apex.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.apex.flags-all",
-    package: "com.android.apex.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.apex.flags/enable_brand_new_apex_flag_values.textproto b/aconfig/trunk_staging/com.android.apex.flags/enable_brand_new_apex_flag_values.textproto
deleted file mode 100644
index 8243df08..00000000
--- a/aconfig/trunk_staging/com.android.apex.flags/enable_brand_new_apex_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.apex.flags"
-  name: "enable_brand_new_apex"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.apex.flags/mount_before_data_flag_values.textproto b/aconfig/trunk_staging/com.android.apex.flags/mount_before_data_flag_values.textproto
deleted file mode 100644
index 56f7709f..00000000
--- a/aconfig/trunk_staging/com.android.apex.flags/mount_before_data_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.apex.flags"
-  name: "mount_before_data"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/Android.bp b/aconfig/trunk_staging/com.android.appsearch.flags/Android.bp
deleted file mode 100644
index 0b038d2b..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.appsearch.flags-all",
-    package: "com.android.appsearch.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/app_open_event_indexer_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/app_open_event_indexer_enabled_flag_values.textproto
deleted file mode 100644
index 874bfde8..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/app_open_event_indexer_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "app_open_event_indexer_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/apps_indexer_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/apps_indexer_enabled_flag_values.textproto
deleted file mode 100644
index 8bb5abe0..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/apps_indexer_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "apps_indexer_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_additional_builder_copy_constructors_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_additional_builder_copy_constructors_flag_values.textproto
deleted file mode 100644
index e0650718..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_additional_builder_copy_constructors_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_additional_builder_copy_constructors"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_all_package_indexing_on_indexer_update_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_all_package_indexing_on_indexer_update_flag_values.textproto
deleted file mode 100644
index 7cc919f9..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_all_package_indexing_on_indexer_update_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_all_package_indexing_on_indexer_update"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_app_functions_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_app_functions_flag_values.textproto
deleted file mode 100644
index fa764195..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_app_functions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_app_functions"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_app_functions_schema_parser_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_app_functions_schema_parser_flag_values.textproto
deleted file mode 100644
index 96236bae..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_app_functions_schema_parser_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_app_functions_schema_parser"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_app_open_events_indexer_check_prior_attempt_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_app_open_events_indexer_check_prior_attempt_flag_values.textproto
deleted file mode 100644
index e6dccc54..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_app_open_events_indexer_check_prior_attempt_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_app_open_events_indexer_check_prior_attempt"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_app_search_manage_blob_files_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_app_search_manage_blob_files_flag_values.textproto
deleted file mode 100644
index c8dc37be..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_app_search_manage_blob_files_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_app_search_manage_blob_files"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_apps_indexer_check_prior_attempt_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_apps_indexer_check_prior_attempt_flag_values.textproto
deleted file mode 100644
index 65c7967a..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_apps_indexer_check_prior_attempt_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_apps_indexer_check_prior_attempt"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_apps_indexer_incremental_put_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_apps_indexer_incremental_put_flag_values.textproto
deleted file mode 100644
index 39122b3d..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_apps_indexer_incremental_put_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_apps_indexer_incremental_put"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_batch_put_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_batch_put_flag_values.textproto
deleted file mode 100644
index b8a4a2ce..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_batch_put_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_batch_put"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_blob_store_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_blob_store_flag_values.textproto
deleted file mode 100644
index 2ab53667..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_blob_store_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_blob_store"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_calculate_time_since_last_attempted_optimize_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_calculate_time_since_last_attempted_optimize_flag_values.textproto
deleted file mode 100644
index 53f08c2f..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_calculate_time_since_last_attempted_optimize_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_calculate_time_since_last_attempted_optimize"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_check_contacts_indexer_delta_timestamps_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_check_contacts_indexer_delta_timestamps_flag_values.textproto
deleted file mode 100644
index ac8a0094..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_check_contacts_indexer_delta_timestamps_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_check_contacts_indexer_delta_timestamps"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_check_contacts_indexer_update_job_params_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_check_contacts_indexer_update_job_params_flag_values.textproto
deleted file mode 100644
index 4be5b34c..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_check_contacts_indexer_update_job_params_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_check_contacts_indexer_update_job_params"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_contacts_index_first_middle_and_last_names_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_contacts_index_first_middle_and_last_names_flag_values.textproto
deleted file mode 100644
index 18763171..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_contacts_index_first_middle_and_last_names_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_contacts_index_first_middle_and_last_names"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_document_limiter_replace_tracking_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_document_limiter_replace_tracking_flag_values.textproto
deleted file mode 100644
index 15a3d24c..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_document_limiter_replace_tracking_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_document_limiter_replace_tracking"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_embedding_match_info_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_embedding_match_info_flag_values.textproto
deleted file mode 100644
index d6a163fb..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_embedding_match_info_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_embedding_match_info"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_enterprise_empty_batch_result_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_enterprise_empty_batch_result_fix_flag_values.textproto
deleted file mode 100644
index a87bf813..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_enterprise_empty_batch_result_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_enterprise_empty_batch_result_fix"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_enterprise_global_search_session_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_enterprise_global_search_session_flag_values.textproto
deleted file mode 100644
index 5df27a65..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_enterprise_global_search_session_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_enterprise_global_search_session"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_four_hour_min_time_optimize_threshold_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_four_hour_min_time_optimize_threshold_flag_values.textproto
deleted file mode 100644
index 12854368..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_four_hour_min_time_optimize_threshold_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_four_hour_min_time_optimize_threshold"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_generic_document_builder_hidden_methods_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_generic_document_builder_hidden_methods_flag_values.textproto
deleted file mode 100644
index a8e10073..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_generic_document_builder_hidden_methods_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_generic_document_builder_hidden_methods"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_generic_document_copy_constructor_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_generic_document_copy_constructor_flag_values.textproto
deleted file mode 100644
index 80048e8a..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_generic_document_copy_constructor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_generic_document_copy_constructor"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_generic_document_over_ipc_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_generic_document_over_ipc_flag_values.textproto
deleted file mode 100644
index c76f797c..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_generic_document_over_ipc_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_generic_document_over_ipc"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_get_parent_types_and_indexable_nested_properties_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_get_parent_types_and_indexable_nested_properties_flag_values.textproto
deleted file mode 100644
index 7b6aeb86..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_get_parent_types_and_indexable_nested_properties_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_get_parent_types_and_indexable_nested_properties"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_grouping_type_per_schema_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_grouping_type_per_schema_flag_values.textproto
deleted file mode 100644
index bd9fc2b6..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_grouping_type_per_schema_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_grouping_type_per_schema"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_informational_ranking_expressions_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_informational_ranking_expressions_flag_values.textproto
deleted file mode 100644
index 2c321a16..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_informational_ranking_expressions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_informational_ranking_expressions"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_isolated_storage_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_isolated_storage_flag_values.textproto
deleted file mode 100644
index af454249..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_isolated_storage_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_isolated_storage"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_list_filter_has_property_function_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_list_filter_has_property_function_flag_values.textproto
deleted file mode 100644
index afc09147..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_list_filter_has_property_function_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_list_filter_has_property_function"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_list_filter_match_score_expression_function_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_list_filter_match_score_expression_function_flag_values.textproto
deleted file mode 100644
index 418f79a0..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_list_filter_match_score_expression_function_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_list_filter_match_score_expression_function"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_marker_file_for_optimize_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_marker_file_for_optimize_flag_values.textproto
deleted file mode 100644
index 36e0d2ec..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_marker_file_for_optimize_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_marker_file_for_optimize"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_put_documents_request_add_taken_actions_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_put_documents_request_add_taken_actions_flag_values.textproto
deleted file mode 100644
index 83538c06..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_put_documents_request_add_taken_actions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_put_documents_request_add_taken_actions"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_qualified_id_join_index_v3_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_qualified_id_join_index_v3_flag_values.textproto
deleted file mode 100644
index 21ae9c7d..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_qualified_id_join_index_v3_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_qualified_id_join_index_v3"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_release_backup_schema_file_if_overlay_present_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_release_backup_schema_file_if_overlay_present_flag_values.textproto
deleted file mode 100644
index 743878d5..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_release_backup_schema_file_if_overlay_present_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_release_backup_schema_file_if_overlay_present"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_result_already_exists_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_result_already_exists_flag_values.textproto
deleted file mode 100644
index 0d88343f..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_result_already_exists_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_result_already_exists"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_result_denied_and_result_rate_limited_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_result_denied_and_result_rate_limited_flag_values.textproto
deleted file mode 100644
index 4619c1e8..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_result_denied_and_result_rate_limited_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_result_denied_and_result_rate_limited"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_safe_parcelable_2_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_safe_parcelable_2_flag_values.textproto
deleted file mode 100644
index bf8415a8..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_safe_parcelable_2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_safe_parcelable_2"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_schema_description_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_schema_description_flag_values.textproto
deleted file mode 100644
index 1e7abe12..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_schema_description_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_schema_description"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_schema_embedding_property_config_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_schema_embedding_property_config_flag_values.textproto
deleted file mode 100644
index aaec4766..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_schema_embedding_property_config_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_schema_embedding_property_config"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_schema_embedding_quantization_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_schema_embedding_quantization_flag_values.textproto
deleted file mode 100644
index 0dc17fcc..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_schema_embedding_quantization_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_schema_embedding_quantization"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_scorable_property_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_scorable_property_flag_values.textproto
deleted file mode 100644
index 16d9249e..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_scorable_property_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_scorable_property"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_search_result_parent_types_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_search_result_parent_types_flag_values.textproto
deleted file mode 100644
index a4c2a686..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_search_result_parent_types_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_search_result_parent_types"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_search_spec_filter_document_ids_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_search_spec_filter_document_ids_flag_values.textproto
deleted file mode 100644
index 0e4d77cb..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_search_spec_filter_document_ids_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_search_spec_filter_document_ids"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_search_spec_filter_properties_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_search_spec_filter_properties_flag_values.textproto
deleted file mode 100644
index a36ee6b7..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_search_spec_filter_properties_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_search_spec_filter_properties"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_search_spec_search_string_parameters_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_search_spec_search_string_parameters_flag_values.textproto
deleted file mode 100644
index bbf57450..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_search_spec_search_string_parameters_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_search_spec_search_string_parameters"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_search_spec_set_search_source_log_tag_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_search_spec_set_search_source_log_tag_flag_values.textproto
deleted file mode 100644
index 0516daa9..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_search_spec_set_search_source_log_tag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_search_spec_set_search_source_log_tag"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_set_publicly_visible_schema_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_set_publicly_visible_schema_flag_values.textproto
deleted file mode 100644
index 36a69277..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_set_publicly_visible_schema_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_set_publicly_visible_schema"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_set_schema_visible_to_configs_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_set_schema_visible_to_configs_flag_values.textproto
deleted file mode 100644
index afb6b0ef..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_set_schema_visible_to_configs_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_set_schema_visible_to_configs"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_soft_index_restoration_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_soft_index_restoration_flag_values.textproto
deleted file mode 100644
index 711bc8c6..00000000
--- a/aconfig/trunk_staging/com.android.appsearch.flags/enable_soft_index_restoration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.appsearch.flags"
-  name: "enable_soft_index_restoration"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.art.flags/Android.bp b/aconfig/trunk_staging/com.android.art.flags/Android.bp
deleted file mode 100644
index e1155d7b..00000000
--- a/aconfig/trunk_staging/com.android.art.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.art.flags-all",
-    package: "com.android.art.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.art.flags/OWNERS b/aconfig/trunk_staging/com.android.art.flags/OWNERS
deleted file mode 100644
index 3414a746..00000000
--- a/aconfig/trunk_staging/com.android.art.flags/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-include platform/art:/OWNERS
diff --git a/aconfig/trunk_staging/com.android.art.flags/art_service_v3_flag_values.textproto b/aconfig/trunk_staging/com.android.art.flags/art_service_v3_flag_values.textproto
deleted file mode 100644
index b1db9be6..00000000
--- a/aconfig/trunk_staging/com.android.art.flags/art_service_v3_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.art.flags"
-  name: "art_service_v3"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.art.flags/executable_method_file_offsets_flag_values.textproto b/aconfig/trunk_staging/com.android.art.flags/executable_method_file_offsets_flag_values.textproto
deleted file mode 100644
index aa1c01cd..00000000
--- a/aconfig/trunk_staging/com.android.art.flags/executable_method_file_offsets_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.art.flags"
-  name: "executable_method_file_offsets"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.art.flags/executable_method_file_offsets_v2_flag_values.textproto b/aconfig/trunk_staging/com.android.art.flags/executable_method_file_offsets_v2_flag_values.textproto
deleted file mode 100644
index ded638af..00000000
--- a/aconfig/trunk_staging/com.android.art.flags/executable_method_file_offsets_v2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.art.flags"
-  name: "executable_method_file_offsets_v2"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.art.flags/m2024_09_ramp_flag_values.textproto b/aconfig/trunk_staging/com.android.art.flags/m2024_09_ramp_flag_values.textproto
deleted file mode 100644
index 3e5fb0c2..00000000
--- a/aconfig/trunk_staging/com.android.art.flags/m2024_09_ramp_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.art.flags"
-  name: "m2024_09_ramp"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.art.flags/m2024_10_ramp_flag_values.textproto b/aconfig/trunk_staging/com.android.art.flags/m2024_10_ramp_flag_values.textproto
deleted file mode 100644
index 741cb582..00000000
--- a/aconfig/trunk_staging/com.android.art.flags/m2024_10_ramp_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.art.flags"
-  name: "m2024_10_ramp"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.art.flags/test_flag_values.textproto b/aconfig/trunk_staging/com.android.art.flags/test_flag_values.textproto
deleted file mode 100644
index 7c6b55db..00000000
--- a/aconfig/trunk_staging/com.android.art.flags/test_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.art.flags"
-  name: "test"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.art.flags/virtual_thread_impl_v1_flag_values.textproto b/aconfig/trunk_staging/com.android.art.flags/virtual_thread_impl_v1_flag_values.textproto
deleted file mode 100644
index eb9775c4..00000000
--- a/aconfig/trunk_staging/com.android.art.flags/virtual_thread_impl_v1_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.art.flags"
-  name: "virtual_thread_impl_v1"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/Android.bp b/aconfig/trunk_staging/com.android.bluetooth.flags/Android.bp
deleted file mode 100644
index 3778e1ae..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.bluetooth.flags-all",
-    package: "com.android.bluetooth.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/TEST_MAPPING b/aconfig/trunk_staging/com.android.bluetooth.flags/TEST_MAPPING
deleted file mode 100644
index f337913b..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/TEST_MAPPING
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "imports": [
-    {
-      "path": "packages/modules/Bluetooth"
-    }
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_aidl_encoding_interval_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_aidl_encoding_interval_flag_values.textproto
deleted file mode 100644
index c05aabe0..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_aidl_encoding_interval_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "a2dp_aidl_encoding_interval"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_async_allow_low_latency_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_async_allow_low_latency_flag_values.textproto
deleted file mode 100644
index 3320d79e..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_async_allow_low_latency_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "a2dp_async_allow_low_latency"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_broadcast_connection_state_when_turned_off_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_broadcast_connection_state_when_turned_off_flag_values.textproto
deleted file mode 100644
index ecf675cb..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_broadcast_connection_state_when_turned_off_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "a2dp_broadcast_connection_state_when_turned_off"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_check_lea_iso_channel_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_check_lea_iso_channel_flag_values.textproto
deleted file mode 100644
index 16563b8e..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_check_lea_iso_channel_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "a2dp_check_lea_iso_channel"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_cleanup_on_remove_device_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_cleanup_on_remove_device_flag_values.textproto
deleted file mode 100644
index 3506b5d9..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_cleanup_on_remove_device_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "a2dp_cleanup_on_remove_device"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_clear_pending_start_on_session_restart_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_clear_pending_start_on_session_restart_flag_values.textproto
deleted file mode 100644
index 53de9377..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_clear_pending_start_on_session_restart_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "a2dp_clear_pending_start_on_session_restart"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_concurrent_source_sink_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_concurrent_source_sink_flag_values.textproto
deleted file mode 100644
index cb22de46..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_concurrent_source_sink_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "a2dp_concurrent_source_sink"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_fix_codec_type_in_java_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_fix_codec_type_in_java_flag_values.textproto
deleted file mode 100644
index 24bb0570..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_fix_codec_type_in_java_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "a2dp_fix_codec_type_in_java"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_ignore_started_when_responder_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_ignore_started_when_responder_flag_values.textproto
deleted file mode 100644
index dac53a26..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_ignore_started_when_responder_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "a2dp_ignore_started_when_responder"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_lhdc_api_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_lhdc_api_flag_values.textproto
deleted file mode 100644
index 0afd80f0..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_lhdc_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "a2dp_lhdc_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_offload_codec_extensibility_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_offload_codec_extensibility_flag_values.textproto
deleted file mode 100644
index 127c266a..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_offload_codec_extensibility_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "a2dp_offload_codec_extensibility"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_service_looper_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_service_looper_flag_values.textproto
deleted file mode 100644
index 985c5177..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_service_looper_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "a2dp_service_looper"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_sm_ignore_connect_events_in_connecting_state_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_sm_ignore_connect_events_in_connecting_state_flag_values.textproto
deleted file mode 100644
index c295474a..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_sm_ignore_connect_events_in_connecting_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "a2dp_sm_ignore_connect_events_in_connecting_state"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_source_threading_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_source_threading_fix_flag_values.textproto
deleted file mode 100644
index 018d5d32..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_source_threading_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "a2dp_source_threading_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_version_1_4_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_version_1_4_flag_values.textproto
deleted file mode 100644
index 632e6f2f..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_version_1_4_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "a2dp_version_1_4"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/adapter_properties_looper_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/adapter_properties_looper_flag_values.textproto
deleted file mode 100644
index 38c76f90..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/adapter_properties_looper_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "adapter_properties_looper"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/adm_always_fallback_to_available_device_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/adm_always_fallback_to_available_device_flag_values.textproto
deleted file mode 100644
index 9be24226..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/adm_always_fallback_to_available_device_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "adm_always_fallback_to_available_device"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/adm_fallback_when_wired_audio_disconnected_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/adm_fallback_when_wired_audio_disconnected_flag_values.textproto
deleted file mode 100644
index eaee2f7e..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/adm_fallback_when_wired_audio_disconnected_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "adm_fallback_when_wired_audio_disconnected"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/adm_fix_disconnect_of_set_member_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/adm_fix_disconnect_of_set_member_flag_values.textproto
deleted file mode 100644
index 8bd64775..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/adm_fix_disconnect_of_set_member_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "adm_fix_disconnect_of_set_member"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/adm_remove_handling_wired_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/adm_remove_handling_wired_flag_values.textproto
deleted file mode 100644
index 786dd6e7..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/adm_remove_handling_wired_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "adm_remove_handling_wired"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/adm_verify_active_fallback_device_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/adm_verify_active_fallback_device_flag_values.textproto
deleted file mode 100644
index 49a2f443..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/adm_verify_active_fallback_device_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "adm_verify_active_fallback_device"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/advertise_thread_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/advertise_thread_flag_values.textproto
deleted file mode 100644
index 37448220..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/advertise_thread_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "advertise_thread"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/aics_api_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/aics_api_flag_values.textproto
deleted file mode 100644
index b70c4a01..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/aics_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "aics_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/airplane_mode_x_ble_on_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/airplane_mode_x_ble_on_flag_values.textproto
deleted file mode 100644
index cd6a377b..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/airplane_mode_x_ble_on_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "airplane_mode_x_ble_on"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/allow_free_last_scn_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/allow_free_last_scn_flag_values.textproto
deleted file mode 100644
index 602f518b..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/allow_free_last_scn_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "allow_free_last_scn"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/allow_gatt_connect_from_the_apps_without_making_leaudio_device_active_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/allow_gatt_connect_from_the_apps_without_making_leaudio_device_active_flag_values.textproto
deleted file mode 100644
index 8e227cd7..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/allow_gatt_connect_from_the_apps_without_making_leaudio_device_active_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "allow_gatt_connect_from_the_apps_without_making_leaudio_device_active"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/allow_switching_hid_and_hogp_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/allow_switching_hid_and_hogp_flag_values.textproto
deleted file mode 100644
index 8ed34fca..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/allow_switching_hid_and_hogp_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "allow_switching_hid_and_hogp"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/android_headtracker_service_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/android_headtracker_service_flag_values.textproto
deleted file mode 100644
index 79af55b2..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/android_headtracker_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "android_headtracker_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/android_os_identifier_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/android_os_identifier_flag_values.textproto
deleted file mode 100644
index 2d86ee47..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/android_os_identifier_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "android_os_identifier"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/api_get_connection_state_using_identity_address_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/api_get_connection_state_using_identity_address_flag_values.textproto
deleted file mode 100644
index ad6a5cdf..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/api_get_connection_state_using_identity_address_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "api_get_connection_state_using_identity_address"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/asha_asrc_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/asha_asrc_flag_values.textproto
deleted file mode 100644
index 756bd4a3..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/asha_asrc_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "asha_asrc"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/asha_encrypted_l2c_coc_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/asha_encrypted_l2c_coc_flag_values.textproto
deleted file mode 100644
index 8eec6205..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/asha_encrypted_l2c_coc_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "asha_encrypted_l2c_coc"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/associate_browse_l2cap_request_with_active_control_channel_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/associate_browse_l2cap_request_with_active_control_channel_flag_values.textproto
deleted file mode 100644
index f1f7a97a..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/associate_browse_l2cap_request_with_active_control_channel_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "associate_browse_l2cap_request_with_active_control_channel"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/asymmetric_phy_for_unidirectional_cis_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/asymmetric_phy_for_unidirectional_cis_flag_values.textproto
deleted file mode 100644
index fdaa06f9..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/asymmetric_phy_for_unidirectional_cis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "asymmetric_phy_for_unidirectional_cis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/audio_port_binder_inherit_rt_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/audio_port_binder_inherit_rt_flag_values.textproto
deleted file mode 100644
index 54d60a0a..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/audio_port_binder_inherit_rt_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "audio_port_binder_inherit_rt"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/auto_connect_on_hfp_when_no_a2dp_device_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/auto_connect_on_hfp_when_no_a2dp_device_flag_values.textproto
deleted file mode 100644
index 22cc03c8..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/auto_connect_on_hfp_when_no_a2dp_device_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "auto_connect_on_hfp_when_no_a2dp_device"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/auto_connect_on_multiple_hfp_when_no_a2dp_device_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/auto_connect_on_multiple_hfp_when_no_a2dp_device_flag_values.textproto
deleted file mode 100644
index 92113538..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/auto_connect_on_multiple_hfp_when_no_a2dp_device_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "auto_connect_on_multiple_hfp_when_no_a2dp_device"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/auto_on_feature_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/auto_on_feature_flag_values.textproto
deleted file mode 100644
index 91fa763d..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/auto_on_feature_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "auto_on_feature"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/auto_transport_pairing_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/auto_transport_pairing_flag_values.textproto
deleted file mode 100644
index f9b53281..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/auto_transport_pairing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "auto_transport_pairing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/av_stream_reconfigure_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/av_stream_reconfigure_fix_flag_values.textproto
deleted file mode 100644
index 87663add..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/av_stream_reconfigure_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "av_stream_reconfigure_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/avdt_discover_seps_as_acceptor_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/avdt_discover_seps_as_acceptor_flag_values.textproto
deleted file mode 100644
index c4518f60..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/avdt_discover_seps_as_acceptor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "avdt_discover_seps_as_acceptor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/avdt_handle_signaling_on_peer_failure_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/avdt_handle_signaling_on_peer_failure_flag_values.textproto
deleted file mode 100644
index ce380932..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/avdt_handle_signaling_on_peer_failure_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "avdt_handle_signaling_on_peer_failure"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/avdt_handle_suspend_cfm_bad_state_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/avdt_handle_suspend_cfm_bad_state_flag_values.textproto
deleted file mode 100644
index c56c32ee..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/avdt_handle_suspend_cfm_bad_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "avdt_handle_suspend_cfm_bad_state"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/avdt_wait_for_initial_delay_report_as_initiator_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/avdt_wait_for_initial_delay_report_as_initiator_flag_values.textproto
deleted file mode 100644
index ad35fccb..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/avdt_wait_for_initial_delay_report_as_initiator_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "avdt_wait_for_initial_delay_report_as_initiator"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/avdtp_error_codes_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/avdtp_error_codes_flag_values.textproto
deleted file mode 100644
index a67acf8e..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/avdtp_error_codes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "avdtp_error_codes"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/avoid_static_loading_of_native_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/avoid_static_loading_of_native_flag_values.textproto
deleted file mode 100644
index ee13d022..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/avoid_static_loading_of_native_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "avoid_static_loading_of_native"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/avrcp_connect_a2dp_with_delay_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/avrcp_connect_a2dp_with_delay_flag_values.textproto
deleted file mode 100644
index 128c4e67..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/avrcp_connect_a2dp_with_delay_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "avrcp_connect_a2dp_with_delay"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/avrcp_sdp_records_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/avrcp_sdp_records_flag_values.textproto
deleted file mode 100644
index 47139378..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/avrcp_sdp_records_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "avrcp_sdp_records"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/batch_scan_optimization_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/batch_scan_optimization_flag_values.textproto
deleted file mode 100644
index ea078743..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/batch_scan_optimization_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "batch_scan_optimization"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/ble_check_data_length_on_legacy_advertising_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/ble_check_data_length_on_legacy_advertising_flag_values.textproto
deleted file mode 100644
index c3b25a24..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/ble_check_data_length_on_legacy_advertising_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "ble_check_data_length_on_legacy_advertising"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/ble_context_map_remove_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/ble_context_map_remove_fix_flag_values.textproto
deleted file mode 100644
index 34fa454f..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/ble_context_map_remove_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "ble_context_map_remove_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/ble_gatt_server_use_address_type_in_connection_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/ble_gatt_server_use_address_type_in_connection_flag_values.textproto
deleted file mode 100644
index 9d16f702..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/ble_gatt_server_use_address_type_in_connection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "ble_gatt_server_use_address_type_in_connection"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/ble_scan_adv_metrics_redesign_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/ble_scan_adv_metrics_redesign_flag_values.textproto
deleted file mode 100644
index d0311220..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/ble_scan_adv_metrics_redesign_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "ble_scan_adv_metrics_redesign"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/ble_scan_setting_does_not_disconnect_if_bt_on_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/ble_scan_setting_does_not_disconnect_if_bt_on_flag_values.textproto
deleted file mode 100644
index cf23f9fe..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/ble_scan_setting_does_not_disconnect_if_bt_on_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "ble_scan_setting_does_not_disconnect_if_bt_on"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/bluffs_mitigation_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/bluffs_mitigation_flag_values.textproto
deleted file mode 100644
index 3aaff76a..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/bluffs_mitigation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "bluffs_mitigation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/bond_transport_after_bond_cancel_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/bond_transport_after_bond_cancel_fix_flag_values.textproto
deleted file mode 100644
index 00c6c1d8..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/bond_transport_after_bond_cancel_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "bond_transport_after_bond_cancel_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/bonded_device_smp_failure_handling_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/bonded_device_smp_failure_handling_flag_values.textproto
deleted file mode 100644
index 413cb270..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/bonded_device_smp_failure_handling_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "bonded_device_smp_failure_handling"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/break_uhid_polling_early_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/break_uhid_polling_early_flag_values.textproto
deleted file mode 100644
index a08983a0..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/break_uhid_polling_early_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "break_uhid_polling_early"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/bt_socket_api_l2cap_cid_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/bt_socket_api_l2cap_cid_flag_values.textproto
deleted file mode 100644
index 1e475c02..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/bt_socket_api_l2cap_cid_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "bt_socket_api_l2cap_cid"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/bt_system_context_report_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/bt_system_context_report_flag_values.textproto
deleted file mode 100644
index 66e67ed0..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/bt_system_context_report_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "bt_system_context_report"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/bta_ag_cmd_brsf_allow_uint32_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/bta_ag_cmd_brsf_allow_uint32_flag_values.textproto
deleted file mode 100644
index 8682e3f0..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/bta_ag_cmd_brsf_allow_uint32_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "bta_ag_cmd_brsf_allow_uint32"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/bta_av_setconfig_rej_type_confusion_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/bta_av_setconfig_rej_type_confusion_flag_values.textproto
deleted file mode 100644
index 15953bba..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/bta_av_setconfig_rej_type_confusion_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "bta_av_setconfig_rej_type_confusion"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/bta_av_use_peer_codec_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/bta_av_use_peer_codec_flag_values.textproto
deleted file mode 100644
index d55ad386..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/bta_av_use_peer_codec_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "bta_av_use_peer_codec"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/bta_dm_defer_device_discovery_state_change_until_rnr_complete_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/bta_dm_defer_device_discovery_state_change_until_rnr_complete_flag_values.textproto
deleted file mode 100644
index 93d19af3..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/bta_dm_defer_device_discovery_state_change_until_rnr_complete_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "bta_dm_defer_device_discovery_state_change_until_rnr_complete"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/bta_dm_disc_close_proper_conn_id_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/bta_dm_disc_close_proper_conn_id_flag_values.textproto
deleted file mode 100644
index 4649c9bc..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/bta_dm_disc_close_proper_conn_id_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "bta_dm_disc_close_proper_conn_id"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/bta_dm_disc_stuck_in_cancelling_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/bta_dm_disc_stuck_in_cancelling_fix_flag_values.textproto
deleted file mode 100644
index b0926321..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/bta_dm_disc_stuck_in_cancelling_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "bta_dm_disc_stuck_in_cancelling_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/bta_dm_discover_both_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/bta_dm_discover_both_flag_values.textproto
deleted file mode 100644
index f8b73fe6..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/bta_dm_discover_both_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "bta_dm_discover_both"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/btsec_avdt_msg_ind_type_confusion_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/btsec_avdt_msg_ind_type_confusion_flag_values.textproto
deleted file mode 100644
index 9aedd9a0..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/btsec_avdt_msg_ind_type_confusion_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "btsec_avdt_msg_ind_type_confusion"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/btsec_check_valid_discovery_database_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/btsec_check_valid_discovery_database_flag_values.textproto
deleted file mode 100644
index 32ef3c54..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/btsec_check_valid_discovery_database_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "btsec_check_valid_discovery_database"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/btsec_le_oob_pairing_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/btsec_le_oob_pairing_flag_values.textproto
deleted file mode 100644
index 64933ce2..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/btsec_le_oob_pairing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "btsec_le_oob_pairing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/cancel_open_discovery_client_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/cancel_open_discovery_client_flag_values.textproto
deleted file mode 100644
index 424d37c5..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/cancel_open_discovery_client_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "cancel_open_discovery_client"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/cancel_pairing_only_on_disconnected_transport_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/cancel_pairing_only_on_disconnected_transport_flag_values.textproto
deleted file mode 100644
index d54bbc74..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/cancel_pairing_only_on_disconnected_transport_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "cancel_pairing_only_on_disconnected_transport"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/change_default_trackable_adv_number_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/change_default_trackable_adv_number_flag_values.textproto
deleted file mode 100644
index 52385c8f..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/change_default_trackable_adv_number_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "change_default_trackable_adv_number"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/channel_sounding_25q2_apis_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/channel_sounding_25q2_apis_flag_values.textproto
deleted file mode 100644
index 2a6c0497..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/channel_sounding_25q2_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "channel_sounding_25q2_apis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/channel_sounding_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/channel_sounding_flag_values.textproto
deleted file mode 100644
index c14e9046..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/channel_sounding_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "channel_sounding"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/channel_sounding_in_stack_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/channel_sounding_in_stack_flag_values.textproto
deleted file mode 100644
index 049adb14..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/channel_sounding_in_stack_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "channel_sounding_in_stack"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/check_peer_hf_indicator_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/check_peer_hf_indicator_flag_values.textproto
deleted file mode 100644
index dec94f39..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/check_peer_hf_indicator_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "check_peer_hf_indicator"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/choose_wrong_hfp_codec_in_specific_config_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/choose_wrong_hfp_codec_in_specific_config_flag_values.textproto
deleted file mode 100644
index a21f12a0..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/choose_wrong_hfp_codec_in_specific_config_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "choose_wrong_hfp_codec_in_specific_config"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/cleanup_le_only_device_type_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/cleanup_le_only_device_type_flag_values.textproto
deleted file mode 100644
index 8330fa27..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/cleanup_le_only_device_type_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "cleanup_le_only_device_type"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/clear_auth_collision_state_on_pairing_complete_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/clear_auth_collision_state_on_pairing_complete_flag_values.textproto
deleted file mode 100644
index 9bb2a2da..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/clear_auth_collision_state_on_pairing_complete_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "clear_auth_collision_state_on_pairing_complete"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/close_hid_if_uhid_ready_too_slow_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/close_hid_if_uhid_ready_too_slow_flag_values.textproto
deleted file mode 100644
index 8bdee4a5..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/close_hid_if_uhid_ready_too_slow_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "close_hid_if_uhid_ready_too_slow"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/close_hid_only_if_connected_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/close_hid_only_if_connected_flag_values.textproto
deleted file mode 100644
index de4f74f6..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/close_hid_only_if_connected_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "close_hid_only_if_connected"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/close_rfcomm_instead_of_reset_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/close_rfcomm_instead_of_reset_flag_values.textproto
deleted file mode 100644
index b6c9d918..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/close_rfcomm_instead_of_reset_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "close_rfcomm_instead_of_reset"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/configure_scan_on_resume_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/configure_scan_on_resume_flag_values.textproto
deleted file mode 100644
index 0f8c2bf6..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/configure_scan_on_resume_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "configure_scan_on_resume"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/connect_hap_on_other_profile_connect_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/connect_hap_on_other_profile_connect_flag_values.textproto
deleted file mode 100644
index eda4d442..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/connect_hap_on_other_profile_connect_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "connect_hap_on_other_profile_connect"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/connect_hid_after_service_discovery_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/connect_hid_after_service_discovery_flag_values.textproto
deleted file mode 100644
index 77a677f9..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/connect_hid_after_service_discovery_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "connect_hid_after_service_discovery"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/continue_service_discovery_when_cancel_device_discovery_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/continue_service_discovery_when_cancel_device_discovery_flag_values.textproto
deleted file mode 100644
index 7f88b893..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/continue_service_discovery_when_cancel_device_discovery_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "continue_service_discovery_when_cancel_device_discovery"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/correct_bond_type_of_loaded_devices_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/correct_bond_type_of_loaded_devices_flag_values.textproto
deleted file mode 100644
index 35dd6f62..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/correct_bond_type_of_loaded_devices_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "correct_bond_type_of_loaded_devices"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/create_metadata_after_bonding_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/create_metadata_after_bonding_flag_values.textproto
deleted file mode 100644
index 1aa3fa69..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/create_metadata_after_bonding_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "create_metadata_after_bonding"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/default_gatt_transport_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/default_gatt_transport_flag_values.textproto
deleted file mode 100644
index 38d385d3..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/default_gatt_transport_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "default_gatt_transport"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/delay_bonding_when_busy_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/delay_bonding_when_busy_flag_values.textproto
deleted file mode 100644
index b7e249c6..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/delay_bonding_when_busy_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "delay_bonding_when_busy"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/device_iot_config_logging_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/device_iot_config_logging_flag_values.textproto
deleted file mode 100644
index 6bb8e20e..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/device_iot_config_logging_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "device_iot_config_logging"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/directed_advertising_api_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/directed_advertising_api_flag_values.textproto
deleted file mode 100644
index 9480b4e0..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/directed_advertising_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "directed_advertising_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/disconnect_acls_by_bredr_disabled_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/disconnect_acls_by_bredr_disabled_flag_values.textproto
deleted file mode 100644
index 5f2ecd74..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/disconnect_acls_by_bredr_disabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "disconnect_acls_by_bredr_disabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/disconnect_hid_channels_serially_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/disconnect_hid_channels_serially_flag_values.textproto
deleted file mode 100644
index aaac133a..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/disconnect_hid_channels_serially_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "disconnect_hid_channels_serially"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/disconnect_on_encryption_failure_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/disconnect_on_encryption_failure_flag_values.textproto
deleted file mode 100644
index 2ac2245b..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/disconnect_on_encryption_failure_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "disconnect_on_encryption_failure"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/disconnect_reason_for_encryption_failure_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/disconnect_reason_for_encryption_failure_flag_values.textproto
deleted file mode 100644
index 79f6d149..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/disconnect_reason_for_encryption_failure_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "disconnect_reason_for_encryption_failure"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/divide_long_single_gap_data_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/divide_long_single_gap_data_flag_values.textproto
deleted file mode 100644
index 61447271..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/divide_long_single_gap_data_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "divide_long_single_gap_data"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/do_not_replace_existing_cod_with_uncategorized_cod_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/do_not_replace_existing_cod_with_uncategorized_cod_flag_values.textproto
deleted file mode 100644
index e73a0a01..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/do_not_replace_existing_cod_with_uncategorized_cod_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "do_not_replace_existing_cod_with_uncategorized_cod"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/donot_push_error_code_to_app_when_connected_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/donot_push_error_code_to_app_when_connected_flag_values.textproto
deleted file mode 100644
index 53a67aea..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/donot_push_error_code_to_app_when_connected_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "donot_push_error_code_to_app_when_connected"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/donot_update_sec_flags_on_csrk_save_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/donot_update_sec_flags_on_csrk_save_flag_values.textproto
deleted file mode 100644
index 58b0cd11..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/donot_update_sec_flags_on_csrk_save_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "donot_update_sec_flags_on_csrk_save"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/donot_validate_bond_state_from_profiles_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/donot_validate_bond_state_from_profiles_flag_values.textproto
deleted file mode 100644
index ed26cede..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/donot_validate_bond_state_from_profiles_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "donot_validate_bond_state_from_profiles"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/dont_send_hid_set_idle_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/dont_send_hid_set_idle_flag_values.textproto
deleted file mode 100644
index bf55a7c0..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/dont_send_hid_set_idle_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "dont_send_hid_set_idle"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/drop_acl_fragment_on_disconnect_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/drop_acl_fragment_on_disconnect_flag_values.textproto
deleted file mode 100644
index 3858b868..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/drop_acl_fragment_on_disconnect_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "drop_acl_fragment_on_disconnect"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/dsa_hw_transparent_codec_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/dsa_hw_transparent_codec_flag_values.textproto
deleted file mode 100644
index ac3782b5..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/dsa_hw_transparent_codec_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "dsa_hw_transparent_codec"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/dumpsys_acquire_stack_when_executing_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/dumpsys_acquire_stack_when_executing_flag_values.textproto
deleted file mode 100644
index d80d7d2f..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/dumpsys_acquire_stack_when_executing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "dumpsys_acquire_stack_when_executing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/dumpsys_use_passed_in_fd_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/dumpsys_use_passed_in_fd_flag_values.textproto
deleted file mode 100644
index 116d965c..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/dumpsys_use_passed_in_fd_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "dumpsys_use_passed_in_fd"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/early_incoming_hid_connection_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/early_incoming_hid_connection_flag_values.textproto
deleted file mode 100644
index 9fa6b306..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/early_incoming_hid_connection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "early_incoming_hid_connection"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/empty_names_are_invalid_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/empty_names_are_invalid_flag_values.textproto
deleted file mode 100644
index bbf52381..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/empty_names_are_invalid_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "empty_names_are_invalid"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/enable_ble_while_disabling_airplane_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/enable_ble_while_disabling_airplane_flag_values.textproto
deleted file mode 100644
index 599d7ae6..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/enable_ble_while_disabling_airplane_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "enable_ble_while_disabling_airplane"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/enable_hap_by_default_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/enable_hap_by_default_flag_values.textproto
deleted file mode 100644
index 07602d74..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/enable_hap_by_default_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "enable_hap_by_default"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/encryption_change_broadcast_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/encryption_change_broadcast_flag_values.textproto
deleted file mode 100644
index 627a66ec..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/encryption_change_broadcast_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "encryption_change_broadcast"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/encryption_change_v2_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/encryption_change_v2_flag_values.textproto
deleted file mode 100644
index 9adca0cb..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/encryption_change_v2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "encryption_change_v2"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/enforce_resolve_system_service_behavior_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/enforce_resolve_system_service_behavior_flag_values.textproto
deleted file mode 100644
index 30e7bba3..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/enforce_resolve_system_service_behavior_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "enforce_resolve_system_service_behavior"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/ensure_valid_adv_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/ensure_valid_adv_flag_flag_values.textproto
deleted file mode 100644
index 22423376..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/ensure_valid_adv_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "ensure_valid_adv_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/enumerate_gatt_errors_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/enumerate_gatt_errors_flag_values.textproto
deleted file mode 100644
index 44f7f544..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/enumerate_gatt_errors_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "enumerate_gatt_errors"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/explicit_kill_from_system_server_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/explicit_kill_from_system_server_flag_values.textproto
deleted file mode 100644
index 5a06d64b..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/explicit_kill_from_system_server_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "explicit_kill_from_system_server"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/fast_bind_to_app_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/fast_bind_to_app_flag_values.textproto
deleted file mode 100644
index 9db6f5e5..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/fast_bind_to_app_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "fast_bind_to_app"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_add_device_properties_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/fix_add_device_properties_flag_values.textproto
deleted file mode 100644
index 23cc06c7..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_add_device_properties_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "fix_add_device_properties"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_avdt_rconfig_not_setting_l2cap_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/fix_avdt_rconfig_not_setting_l2cap_flag_values.textproto
deleted file mode 100644
index f801a3b7..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_avdt_rconfig_not_setting_l2cap_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "fix_avdt_rconfig_not_setting_l2cap"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_bluetooth_gatt_getting_duplicate_services_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/fix_bluetooth_gatt_getting_duplicate_services_flag_values.textproto
deleted file mode 100644
index a429e722..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_bluetooth_gatt_getting_duplicate_services_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "fix_bluetooth_gatt_getting_duplicate_services"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_execute_write_no_pending_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/fix_execute_write_no_pending_flag_values.textproto
deleted file mode 100644
index 6f9d4cd7..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_execute_write_no_pending_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "fix_execute_write_no_pending"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_hfp_qual_1_9_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/fix_hfp_qual_1_9_flag_values.textproto
deleted file mode 100644
index ccb8bcc5..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_hfp_qual_1_9_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "fix_hfp_qual_1_9"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_le_evt_cancelling_sdp_discovery_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/fix_le_evt_cancelling_sdp_discovery_flag_values.textproto
deleted file mode 100644
index c195987d..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_le_evt_cancelling_sdp_discovery_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "fix_le_evt_cancelling_sdp_discovery"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_le_oob_pairing_bypass_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/fix_le_oob_pairing_bypass_flag_values.textproto
deleted file mode 100644
index ea261e66..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_le_oob_pairing_bypass_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "fix_le_oob_pairing_bypass"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_le_pairing_passkey_entry_bypass_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/fix_le_pairing_passkey_entry_bypass_flag_values.textproto
deleted file mode 100644
index 8684b95d..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_le_pairing_passkey_entry_bypass_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "fix_le_pairing_passkey_entry_bypass"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_nonconnectable_scannable_advertisement_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/fix_nonconnectable_scannable_advertisement_flag_values.textproto
deleted file mode 100644
index 3eefdfde..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_nonconnectable_scannable_advertisement_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "fix_nonconnectable_scannable_advertisement"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_pairing_failure_reason_from_remote_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/fix_pairing_failure_reason_from_remote_flag_values.textproto
deleted file mode 100644
index df785701..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_pairing_failure_reason_from_remote_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "fix_pairing_failure_reason_from_remote"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_sco_command_status_handling_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/fix_sco_command_status_handling_flag_values.textproto
deleted file mode 100644
index a0dc4b32..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_sco_command_status_handling_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "fix_sco_command_status_handling"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_unhandled_bqr_subevent_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/fix_unhandled_bqr_subevent_flag_values.textproto
deleted file mode 100644
index bf5a9310..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_unhandled_bqr_subevent_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "fix_unhandled_bqr_subevent"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_unusable_adv_slot_due_to_map_access_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/fix_unusable_adv_slot_due_to_map_access_flag_values.textproto
deleted file mode 100644
index eb6c1a6b..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_unusable_adv_slot_due_to_map_access_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "fix_unusable_adv_slot_due_to_map_access"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/force_bredr_for_sdp_retry_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/force_bredr_for_sdp_retry_flag_values.textproto
deleted file mode 100644
index a4206a62..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/force_bredr_for_sdp_retry_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "force_bredr_for_sdp_retry"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/forward_get_set_report_failure_to_uhid_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/forward_get_set_report_failure_to_uhid_flag_values.textproto
deleted file mode 100644
index 3ea65deb..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/forward_get_set_report_failure_to_uhid_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "forward_get_set_report_failure_to_uhid"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_callback_on_failure_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_callback_on_failure_flag_values.textproto
deleted file mode 100644
index d17fd602..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_callback_on_failure_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "gatt_callback_on_failure"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_cleanup_restricted_handles_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_cleanup_restricted_handles_flag_values.textproto
deleted file mode 100644
index 2a10b52a..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_cleanup_restricted_handles_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "gatt_cleanup_restricted_handles"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_client_dynamic_allocation_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_client_dynamic_allocation_flag_values.textproto
deleted file mode 100644
index d65829a8..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_client_dynamic_allocation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "gatt_client_dynamic_allocation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_disconnect_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_disconnect_fix_flag_values.textproto
deleted file mode 100644
index 1ba36d64..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_disconnect_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "gatt_disconnect_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_drop_acl_on_out_of_resources_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_drop_acl_on_out_of_resources_fix_flag_values.textproto
deleted file mode 100644
index 6cd4fdb5..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_drop_acl_on_out_of_resources_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "gatt_drop_acl_on_out_of_resources_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_fix_device_busy_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_fix_device_busy_flag_values.textproto
deleted file mode 100644
index fb4bc850..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_fix_device_busy_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "gatt_fix_device_busy"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_fix_multiple_direct_connect_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_fix_multiple_direct_connect_flag_values.textproto
deleted file mode 100644
index 1f06f1d4..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_fix_multiple_direct_connect_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "gatt_fix_multiple_direct_connect"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_queue_cleanup_connected_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_queue_cleanup_connected_flag_values.textproto
deleted file mode 100644
index 5f748edc..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_queue_cleanup_connected_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "gatt_queue_cleanup_connected"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_reconnect_on_bt_on_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_reconnect_on_bt_on_fix_flag_values.textproto
deleted file mode 100644
index 80ccb8de..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_reconnect_on_bt_on_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "gatt_reconnect_on_bt_on_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_rediscover_on_canceled_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_rediscover_on_canceled_flag_values.textproto
deleted file mode 100644
index 1399d6e5..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_rediscover_on_canceled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "gatt_rediscover_on_canceled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_server_requests_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_server_requests_fix_flag_values.textproto
deleted file mode 100644
index a85a883c..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_server_requests_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "gatt_server_requests_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/get_address_type_api_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/get_address_type_api_flag_values.textproto
deleted file mode 100644
index 02eba004..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/get_address_type_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "get_address_type_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/get_name_and_address_as_callback_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/get_name_and_address_as_callback_flag_values.textproto
deleted file mode 100644
index 3e693771..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/get_name_and_address_as_callback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "get_name_and_address_as_callback"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/get_profile_use_lock_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/get_profile_use_lock_flag_values.textproto
deleted file mode 100644
index d5c78b20..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/get_profile_use_lock_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "get_profile_use_lock"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/get_state_from_system_server_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/get_state_from_system_server_flag_values.textproto
deleted file mode 100644
index 0201ac37..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/get_state_from_system_server_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "get_state_from_system_server"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/guard_bonded_device_properties_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/guard_bonded_device_properties_flag_values.textproto
deleted file mode 100644
index 48cde711..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/guard_bonded_device_properties_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "guard_bonded_device_properties"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/guest_mode_bond_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/guest_mode_bond_flag_values.textproto
deleted file mode 100644
index 2582a43b..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/guest_mode_bond_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "guest_mode_bond"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/handle_delivery_sending_failure_events_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/handle_delivery_sending_failure_events_flag_values.textproto
deleted file mode 100644
index a3240e35..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/handle_delivery_sending_failure_events_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "handle_delivery_sending_failure_events"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/hap_connect_only_requested_device_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/hap_connect_only_requested_device_flag_values.textproto
deleted file mode 100644
index 26f419f4..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/hap_connect_only_requested_device_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "hap_connect_only_requested_device"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/hci_vendor_specific_extension_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/hci_vendor_specific_extension_flag_values.textproto
deleted file mode 100644
index 43aaca61..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/hci_vendor_specific_extension_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "hci_vendor_specific_extension"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/headset_client_am_hf_volume_symmetric_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/headset_client_am_hf_volume_symmetric_flag_values.textproto
deleted file mode 100644
index 94640af7..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/headset_client_am_hf_volume_symmetric_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "headset_client_am_hf_volume_symmetric"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/headtracker_codec_capability_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/headtracker_codec_capability_flag_values.textproto
deleted file mode 100644
index 391aee42..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/headtracker_codec_capability_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "headtracker_codec_capability"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/headtracker_sdu_size_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/headtracker_sdu_size_flag_values.textproto
deleted file mode 100644
index d3f7738f..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/headtracker_sdu_size_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "headtracker_sdu_size"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/hfp_codec_aptx_voice_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/hfp_codec_aptx_voice_flag_values.textproto
deleted file mode 100644
index 62d99bcf..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/hfp_codec_aptx_voice_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "hfp_codec_aptx_voice"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/hid_report_queuing_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/hid_report_queuing_flag_values.textproto
deleted file mode 100644
index 161e0f61..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/hid_report_queuing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "hid_report_queuing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/hogp_reconnection_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/hogp_reconnection_flag_values.textproto
deleted file mode 100644
index 53e094d0..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/hogp_reconnection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "hogp_reconnection"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/identity_address_null_if_not_known_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/identity_address_null_if_not_known_flag_values.textproto
deleted file mode 100644
index a671456e..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/identity_address_null_if_not_known_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "identity_address_null_if_not_known"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/identity_address_type_api_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/identity_address_type_api_flag_values.textproto
deleted file mode 100644
index d4114a1e..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/identity_address_type_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "identity_address_type_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/ignore_bond_type_for_le_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/ignore_bond_type_for_le_flag_values.textproto
deleted file mode 100644
index 8b1fa06b..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/ignore_bond_type_for_le_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "ignore_bond_type_for_le"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/ignore_notify_when_already_connected_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/ignore_notify_when_already_connected_flag_values.textproto
deleted file mode 100644
index f1843d00..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/ignore_notify_when_already_connected_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "ignore_notify_when_already_connected"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/ignore_unrelated_cancel_bond_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/ignore_unrelated_cancel_bond_flag_values.textproto
deleted file mode 100644
index 96411d51..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/ignore_unrelated_cancel_bond_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "ignore_unrelated_cancel_bond"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/immediate_encryption_after_pairing_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/immediate_encryption_after_pairing_flag_values.textproto
deleted file mode 100644
index 3d4f1d8b..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/immediate_encryption_after_pairing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "immediate_encryption_after_pairing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/improve_create_connection_for_already_connecting_device_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/improve_create_connection_for_already_connecting_device_flag_values.textproto
deleted file mode 100644
index 18675cc7..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/improve_create_connection_for_already_connecting_device_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "improve_create_connection_for_already_connecting_device"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/indicate_rfcomm_connection_complete_after_msc_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/indicate_rfcomm_connection_complete_after_msc_flag_values.textproto
deleted file mode 100644
index 6616ef14..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/indicate_rfcomm_connection_complete_after_msc_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "indicate_rfcomm_connection_complete_after_msc"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/initial_conn_params_p1_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/initial_conn_params_p1_flag_values.textproto
deleted file mode 100644
index 8cd952b7..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/initial_conn_params_p1_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "initial_conn_params_p1"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/initiate_multiple_hid_connections_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/initiate_multiple_hid_connections_flag_values.textproto
deleted file mode 100644
index 7709c745..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/initiate_multiple_hid_connections_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "initiate_multiple_hid_connections"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/is_sco_managed_by_audio_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/is_sco_managed_by_audio_flag_values.textproto
deleted file mode 100644
index 7878ba5b..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/is_sco_managed_by_audio_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "is_sco_managed_by_audio"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/keep_hfp_active_during_leaudio_handover_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/keep_hfp_active_during_leaudio_handover_flag_values.textproto
deleted file mode 100644
index 86a4fb65..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/keep_hfp_active_during_leaudio_handover_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "keep_hfp_active_during_leaudio_handover"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/keep_stopped_media_browser_service_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/keep_stopped_media_browser_service_flag_values.textproto
deleted file mode 100644
index 7214436d..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/keep_stopped_media_browser_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "keep_stopped_media_browser_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/key_missing_as_ordered_broadcast_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/key_missing_as_ordered_broadcast_flag_values.textproto
deleted file mode 100644
index 223fd26b..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/key_missing_as_ordered_broadcast_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "key_missing_as_ordered_broadcast"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/key_missing_ble_peripheral_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/key_missing_ble_peripheral_flag_values.textproto
deleted file mode 100644
index 04f8b074..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/key_missing_ble_peripheral_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "key_missing_ble_peripheral"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/key_missing_broadcast_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/key_missing_broadcast_flag_values.textproto
deleted file mode 100644
index c5d401a3..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/key_missing_broadcast_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "key_missing_broadcast"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/key_missing_classic_device_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/key_missing_classic_device_flag_values.textproto
deleted file mode 100644
index 961a656a..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/key_missing_classic_device_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "key_missing_classic_device"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/key_missing_public_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/key_missing_public_flag_values.textproto
deleted file mode 100644
index bcb9db34..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/key_missing_public_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "key_missing_public"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/kill_instead_of_exit_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/kill_instead_of_exit_flag_values.textproto
deleted file mode 100644
index 2d8d2ec4..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/kill_instead_of_exit_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "kill_instead_of_exit"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/l2cap_fcs_option_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/l2cap_fcs_option_fix_flag_values.textproto
deleted file mode 100644
index 0b7a8d0d..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/l2cap_fcs_option_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "l2cap_fcs_option_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/l2cap_le_do_not_adjust_min_interval_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/l2cap_le_do_not_adjust_min_interval_flag_values.textproto
deleted file mode 100644
index 1534c381..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/l2cap_le_do_not_adjust_min_interval_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "l2cap_le_do_not_adjust_min_interval"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/l2cap_p_ccb_check_rewrite_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/l2cap_p_ccb_check_rewrite_flag_values.textproto
deleted file mode 100644
index 202c7212..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/l2cap_p_ccb_check_rewrite_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "l2cap_p_ccb_check_rewrite"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/l2cap_tx_complete_cb_info_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/l2cap_tx_complete_cb_info_flag_values.textproto
deleted file mode 100644
index c39941f8..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/l2cap_tx_complete_cb_info_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "l2cap_tx_complete_cb_info"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/l2cap_update_existing_conn_interval_with_base_interval_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/l2cap_update_existing_conn_interval_with_base_interval_flag_values.textproto
deleted file mode 100644
index 9aba72be..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/l2cap_update_existing_conn_interval_with_base_interval_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "l2cap_update_existing_conn_interval_with_base_interval"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/le_appearance_after_ctkd_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/le_appearance_after_ctkd_flag_values.textproto
deleted file mode 100644
index 67d50ea9..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/le_appearance_after_ctkd_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "le_appearance_after_ctkd"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/le_ase_read_multiple_variable_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/le_ase_read_multiple_variable_flag_values.textproto
deleted file mode 100644
index e47f79ae..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/le_ase_read_multiple_variable_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "le_ase_read_multiple_variable"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/le_audio_base_ecosystem_interval_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/le_audio_base_ecosystem_interval_flag_values.textproto
deleted file mode 100644
index 72ecd944..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/le_audio_base_ecosystem_interval_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "le_audio_base_ecosystem_interval"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/le_audio_dev_type_detection_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/le_audio_dev_type_detection_fix_flag_values.textproto
deleted file mode 100644
index 6717d405..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/le_audio_dev_type_detection_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "le_audio_dev_type_detection_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/le_audio_fast_bond_params_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/le_audio_fast_bond_params_flag_values.textproto
deleted file mode 100644
index 1c05743e..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/le_audio_fast_bond_params_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "le_audio_fast_bond_params"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/le_audio_support_unidirectional_voice_assistant_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/le_audio_support_unidirectional_voice_assistant_flag_values.textproto
deleted file mode 100644
index 595d6cc8..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/le_audio_support_unidirectional_voice_assistant_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "le_audio_support_unidirectional_voice_assistant"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/le_enc_on_reconnect_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/le_enc_on_reconnect_flag_values.textproto
deleted file mode 100644
index a4adf09c..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/le_enc_on_reconnect_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "le_enc_on_reconnect"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/le_encryption_refresh_failure_handling_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/le_encryption_refresh_failure_handling_flag_values.textproto
deleted file mode 100644
index a60853da..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/le_encryption_refresh_failure_handling_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "le_encryption_refresh_failure_handling"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/le_impl_ack_pause_disarmed_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/le_impl_ack_pause_disarmed_flag_values.textproto
deleted file mode 100644
index cb0aa455..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/le_impl_ack_pause_disarmed_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "le_impl_ack_pause_disarmed"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/le_inquiry_duration_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/le_inquiry_duration_flag_values.textproto
deleted file mode 100644
index 3d8d357e..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/le_inquiry_duration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "le_inquiry_duration"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/le_periodic_scanning_reassembler_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/le_periodic_scanning_reassembler_flag_values.textproto
deleted file mode 100644
index 31edf4b1..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/le_periodic_scanning_reassembler_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "le_periodic_scanning_reassembler"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/le_peripheral_enc_failure_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/le_peripheral_enc_failure_flag_values.textproto
deleted file mode 100644
index 2757f199..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/le_peripheral_enc_failure_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "le_peripheral_enc_failure"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/le_scan_fix_remote_exception_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/le_scan_fix_remote_exception_flag_values.textproto
deleted file mode 100644
index efd72354..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/le_scan_fix_remote_exception_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "le_scan_fix_remote_exception"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/le_scan_parameters_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/le_scan_parameters_fix_flag_values.textproto
deleted file mode 100644
index a0981833..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/le_scan_parameters_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "le_scan_parameters_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/le_scan_use_address_type_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/le_scan_use_address_type_flag_values.textproto
deleted file mode 100644
index 34bbb60d..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/le_scan_use_address_type_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "le_scan_use_address_type"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/le_scan_use_uid_for_importance_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/le_scan_use_uid_for_importance_flag_values.textproto
deleted file mode 100644
index 5c4b5995..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/le_scan_use_uid_for_importance_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "le_scan_use_uid_for_importance"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_active_device_manager_group_handling_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_active_device_manager_group_handling_fix_flag_values.textproto
deleted file mode 100644
index 2b6c1a23..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_active_device_manager_group_handling_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_active_device_manager_group_handling_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_add_aics_support_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_add_aics_support_flag_values.textproto
deleted file mode 100644
index 4a6659f9..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_add_aics_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_add_aics_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_add_opus_codec_type_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_add_opus_codec_type_flag_values.textproto
deleted file mode 100644
index 6c93ecc6..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_add_opus_codec_type_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_add_opus_codec_type"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_add_sampling_frequencies_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_add_sampling_frequencies_flag_values.textproto
deleted file mode 100644
index 475c7019..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_add_sampling_frequencies_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_add_sampling_frequencies"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_allow_leaudio_only_devices_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_allow_leaudio_only_devices_flag_values.textproto
deleted file mode 100644
index 5a6c4846..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_allow_leaudio_only_devices_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_allow_leaudio_only_devices"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_allowed_context_mask_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_allowed_context_mask_flag_values.textproto
deleted file mode 100644
index a8bb1d77..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_allowed_context_mask_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_allowed_context_mask"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_api_synchronized_block_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_api_synchronized_block_fix_flag_values.textproto
deleted file mode 100644
index e65d26d0..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_api_synchronized_block_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_api_synchronized_block_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_bass_scan_with_internal_scan_controller_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_bass_scan_with_internal_scan_controller_flag_values.textproto
deleted file mode 100644
index 75dc710d..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_bass_scan_with_internal_scan_controller_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_bass_scan_with_internal_scan_controller"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_big_depends_on_audio_state_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_big_depends_on_audio_state_flag_values.textproto
deleted file mode 100644
index 1b2739e3..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_big_depends_on_audio_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_big_depends_on_audio_state"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_api_get_local_metadata_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_api_get_local_metadata_flag_values.textproto
deleted file mode 100644
index a98d5e9e..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_api_get_local_metadata_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_broadcast_api_get_local_metadata"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_api_manage_primary_group_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_api_manage_primary_group_flag_values.textproto
deleted file mode 100644
index 2c2f853b..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_api_manage_primary_group_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_broadcast_api_manage_primary_group"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_assistant_handle_command_statuses_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_assistant_handle_command_statuses_flag_values.textproto
deleted file mode 100644
index f9c383ee..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_assistant_handle_command_statuses_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_broadcast_assistant_handle_command_statuses"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_assistant_peripheral_entrustment_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_assistant_peripheral_entrustment_flag_values.textproto
deleted file mode 100644
index 77e7bebb..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_assistant_peripheral_entrustment_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_broadcast_assistant_peripheral_entrustment"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_audio_handover_policies_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_audio_handover_policies_flag_values.textproto
deleted file mode 100644
index e0b3ec15..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_audio_handover_policies_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_broadcast_audio_handover_policies"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_destroy_after_timeout_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_destroy_after_timeout_flag_values.textproto
deleted file mode 100644
index 05b6c5b0..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_destroy_after_timeout_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_broadcast_destroy_after_timeout"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_extract_periodic_scanner_from_state_machine_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_extract_periodic_scanner_from_state_machine_flag_values.textproto
deleted file mode 100644
index e452f191..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_extract_periodic_scanner_from_state_machine_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_broadcast_extract_periodic_scanner_from_state_machine"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_feature_support_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_feature_support_flag_values.textproto
deleted file mode 100644
index a9e30b7a..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_feature_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_broadcast_feature_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_monitor_source_sync_status_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_monitor_source_sync_status_flag_values.textproto
deleted file mode 100644
index c597d893..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_monitor_source_sync_status_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_broadcast_monitor_source_sync_status"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_prevent_resume_interruption_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_prevent_resume_interruption_flag_values.textproto
deleted file mode 100644
index 4c3a00e5..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_prevent_resume_interruption_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_broadcast_prevent_resume_interruption"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_primary_group_selection_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_primary_group_selection_flag_values.textproto
deleted file mode 100644
index bce4544f..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_primary_group_selection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_broadcast_primary_group_selection"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_receive_state_processing_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_receive_state_processing_refactor_flag_values.textproto
deleted file mode 100644
index 3ba29866..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_receive_state_processing_refactor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_broadcast_receive_state_processing_refactor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_resync_helper_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_resync_helper_flag_values.textproto
deleted file mode 100644
index 8753f4cb..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_resync_helper_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_broadcast_resync_helper"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_update_metadata_callback_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_update_metadata_callback_flag_values.textproto
deleted file mode 100644
index d3d232eb..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_update_metadata_callback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_broadcast_update_metadata_callback"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_volume_control_for_connected_devices_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_volume_control_for_connected_devices_flag_values.textproto
deleted file mode 100644
index 3d87d6ca..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_volume_control_for_connected_devices_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_broadcast_volume_control_for_connected_devices"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_volume_control_primary_group_only_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_volume_control_primary_group_only_flag_values.textproto
deleted file mode 100644
index 7f93a152..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_volume_control_primary_group_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_broadcast_volume_control_primary_group_only"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_volume_control_with_set_volume_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_volume_control_with_set_volume_flag_values.textproto
deleted file mode 100644
index 44a79792..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_volume_control_with_set_volume_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_broadcast_volume_control_with_set_volume"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_call_start_scan_directly_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_call_start_scan_directly_flag_values.textproto
deleted file mode 100644
index 48bf4e5e..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_call_start_scan_directly_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_call_start_scan_directly"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_callback_on_group_stream_status_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_callback_on_group_stream_status_flag_values.textproto
deleted file mode 100644
index f69b4329..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_callback_on_group_stream_status_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_callback_on_group_stream_status"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_codec_config_callback_order_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_codec_config_callback_order_fix_flag_values.textproto
deleted file mode 100644
index f0929a41..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_codec_config_callback_order_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_codec_config_callback_order_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_dynamic_spatial_audio_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_dynamic_spatial_audio_flag_values.textproto
deleted file mode 100644
index d81ac2ef..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_dynamic_spatial_audio_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_dynamic_spatial_audio"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_enable_health_based_actions_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_enable_health_based_actions_flag_values.textproto
deleted file mode 100644
index 613a8ebd..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_enable_health_based_actions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_enable_health_based_actions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_getting_active_state_support_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_getting_active_state_support_flag_values.textproto
deleted file mode 100644
index 67e9dadd..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_getting_active_state_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_getting_active_state_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_gmap_client_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_gmap_client_flag_values.textproto
deleted file mode 100644
index 3d95dd66..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_gmap_client_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_gmap_client"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_hal_client_asrc_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_hal_client_asrc_flag_values.textproto
deleted file mode 100644
index dfb962c7..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_hal_client_asrc_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_hal_client_asrc"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_improve_switch_during_phone_call_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_improve_switch_during_phone_call_flag_values.textproto
deleted file mode 100644
index 29842e21..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_improve_switch_during_phone_call_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_improve_switch_during_phone_call"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_mcs_tbs_authorization_rebond_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_mcs_tbs_authorization_rebond_fix_flag_values.textproto
deleted file mode 100644
index f7981227..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_mcs_tbs_authorization_rebond_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_mcs_tbs_authorization_rebond_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_monitor_unicast_source_when_managed_by_broadcast_delegator_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_monitor_unicast_source_when_managed_by_broadcast_delegator_flag_values.textproto
deleted file mode 100644
index f9474a32..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_monitor_unicast_source_when_managed_by_broadcast_delegator_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_monitor_unicast_source_when_managed_by_broadcast_delegator"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_mono_location_errata_api_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_mono_location_errata_api_flag_values.textproto
deleted file mode 100644
index 61bad1a8..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_mono_location_errata_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_mono_location_errata_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_mono_location_errata_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_mono_location_errata_flag_values.textproto
deleted file mode 100644
index 272ecab9..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_mono_location_errata_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_mono_location_errata"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_multicodec_aidl_support_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_multicodec_aidl_support_flag_values.textproto
deleted file mode 100644
index e1979779..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_multicodec_aidl_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_multicodec_aidl_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_multiple_vocs_instances_api_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_multiple_vocs_instances_api_flag_values.textproto
deleted file mode 100644
index c68f1818..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_multiple_vocs_instances_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_multiple_vocs_instances_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_no_context_validate_streaming_request_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_no_context_validate_streaming_request_flag_values.textproto
deleted file mode 100644
index 3e416e31..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_no_context_validate_streaming_request_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_no_context_validate_streaming_request"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_quick_leaudio_toggle_switch_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_quick_leaudio_toggle_switch_fix_flag_values.textproto
deleted file mode 100644
index 958cb177..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_quick_leaudio_toggle_switch_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_quick_leaudio_toggle_switch_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_resume_active_after_hfp_handover_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_resume_active_after_hfp_handover_flag_values.textproto
deleted file mode 100644
index da8655e5..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_resume_active_after_hfp_handover_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_resume_active_after_hfp_handover"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_set_codec_config_preference_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_set_codec_config_preference_flag_values.textproto
deleted file mode 100644
index 0d732967..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_set_codec_config_preference_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_set_codec_config_preference"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_sm_ignore_connect_events_in_connecting_state_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_sm_ignore_connect_events_in_connecting_state_flag_values.textproto
deleted file mode 100644
index c907c6e1..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_sm_ignore_connect_events_in_connecting_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_sm_ignore_connect_events_in_connecting_state"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_sort_scans_to_sync_by_fails_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_sort_scans_to_sync_by_fails_flag_values.textproto
deleted file mode 100644
index f040074f..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_sort_scans_to_sync_by_fails_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_sort_scans_to_sync_by_fails"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_speed_up_reconfiguration_between_call_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_speed_up_reconfiguration_between_call_flag_values.textproto
deleted file mode 100644
index f4080ef6..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_speed_up_reconfiguration_between_call_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_speed_up_reconfiguration_between_call"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_start_request_state_mutex_check_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_start_request_state_mutex_check_flag_values.textproto
deleted file mode 100644
index 84b8da34..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_start_request_state_mutex_check_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_start_request_state_mutex_check"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_start_stream_race_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_start_stream_race_fix_flag_values.textproto
deleted file mode 100644
index 07142917..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_start_stream_race_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_start_stream_race_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_stop_updated_to_not_available_context_stream_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_stop_updated_to_not_available_context_stream_flag_values.textproto
deleted file mode 100644
index 6b76b193..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_stop_updated_to_not_available_context_stream_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_stop_updated_to_not_available_context_stream"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_synchronize_start_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_synchronize_start_flag_values.textproto
deleted file mode 100644
index df2c5a78..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_synchronize_start_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_synchronize_start"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_unicast_inactivate_device_based_on_context_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_unicast_inactivate_device_based_on_context_flag_values.textproto
deleted file mode 100644
index dc2ba8fc..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_unicast_inactivate_device_based_on_context_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_unicast_inactivate_device_based_on_context"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_unicast_no_available_contexts_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_unicast_no_available_contexts_flag_values.textproto
deleted file mode 100644
index d7dcff82..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_unicast_no_available_contexts_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_unicast_no_available_contexts"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_use_audio_mode_listener_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_use_audio_mode_listener_flag_values.textproto
deleted file mode 100644
index 0b98bec6..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_use_audio_mode_listener_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_use_audio_mode_listener"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_use_audio_recording_listener_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_use_audio_recording_listener_flag_values.textproto
deleted file mode 100644
index 11c1e816..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_use_audio_recording_listener_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_use_audio_recording_listener"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_volume_change_on_ringtone_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_volume_change_on_ringtone_fix_flag_values.textproto
deleted file mode 100644
index 3eac0c5a..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_volume_change_on_ringtone_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_volume_change_on_ringtone_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/load_did_config_from_sysprops_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/load_did_config_from_sysprops_flag_values.textproto
deleted file mode 100644
index 6be64b17..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/load_did_config_from_sysprops_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "load_did_config_from_sysprops"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/maintain_call_index_after_conference_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/maintain_call_index_after_conference_flag_values.textproto
deleted file mode 100644
index c52f5b42..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/maintain_call_index_after_conference_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "maintain_call_index_after_conference"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/map_limit_notification_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/map_limit_notification_flag_values.textproto
deleted file mode 100644
index a5cc30fa..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/map_limit_notification_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "map_limit_notification"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/mcp_allow_play_without_active_player_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/mcp_allow_play_without_active_player_flag_values.textproto
deleted file mode 100644
index fb577cfc..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/mcp_allow_play_without_active_player_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "mcp_allow_play_without_active_player"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/metadata_api_inactive_audio_device_upon_connection_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/metadata_api_inactive_audio_device_upon_connection_flag_values.textproto
deleted file mode 100644
index 5389b8f8..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/metadata_api_inactive_audio_device_upon_connection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "metadata_api_inactive_audio_device_upon_connection"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/metadata_api_microphone_for_call_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/metadata_api_microphone_for_call_enabled_flag_values.textproto
deleted file mode 100644
index a0585279..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/metadata_api_microphone_for_call_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "metadata_api_microphone_for_call_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/mfi_has_uuid_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/mfi_has_uuid_flag_values.textproto
deleted file mode 100644
index 3d0add36..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/mfi_has_uuid_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "mfi_has_uuid"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/name_discovery_for_le_pairing_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/name_discovery_for_le_pairing_flag_values.textproto
deleted file mode 100644
index ddeb7e5d..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/name_discovery_for_le_pairing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "name_discovery_for_le_pairing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/non_wake_alarm_for_rpa_rotation_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/non_wake_alarm_for_rpa_rotation_flag_values.textproto
deleted file mode 100644
index 6981d3f2..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/non_wake_alarm_for_rpa_rotation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "non_wake_alarm_for_rpa_rotation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/opp_check_content_uri_permissions_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/opp_check_content_uri_permissions_flag_values.textproto
deleted file mode 100644
index 5966a418..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/opp_check_content_uri_permissions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "opp_check_content_uri_permissions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/opp_fix_multiple_notifications_issues_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/opp_fix_multiple_notifications_issues_flag_values.textproto
deleted file mode 100644
index fcdd073f..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/opp_fix_multiple_notifications_issues_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "opp_fix_multiple_notifications_issues"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/opp_ignore_content_observer_after_service_stop_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/opp_ignore_content_observer_after_service_stop_flag_values.textproto
deleted file mode 100644
index dc579805..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/opp_ignore_content_observer_after_service_stop_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "opp_ignore_content_observer_after_service_stop"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/opp_remove_empty_group_notification_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/opp_remove_empty_group_notification_flag_values.textproto
deleted file mode 100644
index d3c873e0..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/opp_remove_empty_group_notification_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "opp_remove_empty_group_notification"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/opp_set_insets_for_edge_to_edge_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/opp_set_insets_for_edge_to_edge_flag_values.textproto
deleted file mode 100644
index c9602a35..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/opp_set_insets_for_edge_to_edge_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "opp_set_insets_for_edge_to_edge"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/opp_start_activity_directly_from_notification_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/opp_start_activity_directly_from_notification_flag_values.textproto
deleted file mode 100644
index 592ee489..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/opp_start_activity_directly_from_notification_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "opp_start_activity_directly_from_notification"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/override_context_to_specify_device_id_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/override_context_to_specify_device_id_flag_values.textproto
deleted file mode 100644
index b66b004c..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/override_context_to_specify_device_id_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "override_context_to_specify_device_id"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/pairing_name_discovery_addresss_mismatch_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/pairing_name_discovery_addresss_mismatch_flag_values.textproto
deleted file mode 100644
index 95a039b9..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/pairing_name_discovery_addresss_mismatch_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "pairing_name_discovery_addresss_mismatch"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/pairing_on_unknown_transport_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/pairing_on_unknown_transport_flag_values.textproto
deleted file mode 100644
index 2bf30b67..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/pairing_on_unknown_transport_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "pairing_on_unknown_transport"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/pan_use_identity_address_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/pan_use_identity_address_flag_values.textproto
deleted file mode 100644
index cdc16bb3..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/pan_use_identity_address_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "pan_use_identity_address"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/pbap_client_storage_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/pbap_client_storage_refactor_flag_values.textproto
deleted file mode 100644
index 7ba73798..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/pbap_client_storage_refactor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "pbap_client_storage_refactor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/pbap_limit_call_log_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/pbap_limit_call_log_flag_values.textproto
deleted file mode 100644
index 654613ce..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/pbap_limit_call_log_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "pbap_limit_call_log"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/pending_hid_connection_cancellation_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/pending_hid_connection_cancellation_flag_values.textproto
deleted file mode 100644
index 8ed516fd..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/pending_hid_connection_cancellation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "pending_hid_connection_cancellation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/peripheral_auth_req_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/peripheral_auth_req_flag_values.textproto
deleted file mode 100644
index a365d7f5..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/peripheral_auth_req_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "peripheral_auth_req"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/phy_to_native_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/phy_to_native_flag_values.textproto
deleted file mode 100644
index d15dbf35..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/phy_to_native_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "phy_to_native"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/pretend_network_service_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/pretend_network_service_flag_values.textproto
deleted file mode 100644
index 39be5818..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/pretend_network_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "pretend_network_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/prevent_concurrent_conn_param_updates_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/prevent_concurrent_conn_param_updates_flag_values.textproto
deleted file mode 100644
index bafef1f0..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/prevent_concurrent_conn_param_updates_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "prevent_concurrent_conn_param_updates"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/prevent_duplicate_uuid_intent_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/prevent_duplicate_uuid_intent_flag_values.textproto
deleted file mode 100644
index 60343400..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/prevent_duplicate_uuid_intent_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "prevent_duplicate_uuid_intent"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/prevent_hogp_reconnect_when_connected_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/prevent_hogp_reconnect_when_connected_flag_values.textproto
deleted file mode 100644
index 52364359..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/prevent_hogp_reconnect_when_connected_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "prevent_hogp_reconnect_when_connected"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/prevent_service_connections_on_remove_bond_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/prevent_service_connections_on_remove_bond_flag_values.textproto
deleted file mode 100644
index 2071b008..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/prevent_service_connections_on_remove_bond_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "prevent_service_connections_on_remove_bond"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/progress_acl_scheduler_upon_incoming_connection_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/progress_acl_scheduler_upon_incoming_connection_flag_values.textproto
deleted file mode 100644
index a4a06293..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/progress_acl_scheduler_upon_incoming_connection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "progress_acl_scheduler_upon_incoming_connection"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/queue_dis_requests_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/queue_dis_requests_flag_values.textproto
deleted file mode 100644
index dc847d77..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/queue_dis_requests_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "queue_dis_requests"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/read_le_appearance_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/read_le_appearance_flag_values.textproto
deleted file mode 100644
index 4a4c33a4..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/read_le_appearance_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "read_le_appearance"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/read_model_num_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/read_model_num_fix_flag_values.textproto
deleted file mode 100644
index b2fd19f9..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/read_model_num_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "read_model_num_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/remove_address_map_on_unbond_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/remove_address_map_on_unbond_flag_values.textproto
deleted file mode 100644
index 47d8de87..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/remove_address_map_on_unbond_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "remove_address_map_on_unbond"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/remove_device_in_main_thread_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/remove_device_in_main_thread_flag_values.textproto
deleted file mode 100644
index ac9d8443..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/remove_device_in_main_thread_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "remove_device_in_main_thread"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/remove_dup_pairing_response_in_oob_pairing_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/remove_dup_pairing_response_in_oob_pairing_flag_values.textproto
deleted file mode 100644
index e9fa2b24..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/remove_dup_pairing_response_in_oob_pairing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "remove_dup_pairing_response_in_oob_pairing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/remove_input_device_on_vup_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/remove_input_device_on_vup_flag_values.textproto
deleted file mode 100644
index 98d9f97f..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/remove_input_device_on_vup_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "remove_input_device_on_vup"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/remove_one_time_get_name_and_address_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/remove_one_time_get_name_and_address_flag_values.textproto
deleted file mode 100644
index b3011a1c..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/remove_one_time_get_name_and_address_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "remove_one_time_get_name_and_address"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/remove_pending_hid_connection_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/remove_pending_hid_connection_flag_values.textproto
deleted file mode 100644
index 69d58d2b..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/remove_pending_hid_connection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "remove_pending_hid_connection"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/report_vsc_data_from_the_gd_controller_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/report_vsc_data_from_the_gd_controller_flag_values.textproto
deleted file mode 100644
index ba5e8eab..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/report_vsc_data_from_the_gd_controller_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "report_vsc_data_from_the_gd_controller"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/reset_after_collision_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/reset_after_collision_flag_values.textproto
deleted file mode 100644
index 7d594bc1..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/reset_after_collision_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "reset_after_collision"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/reset_ag_state_on_collision_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/reset_ag_state_on_collision_flag_values.textproto
deleted file mode 100644
index 1bf9f2ec..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/reset_ag_state_on_collision_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "reset_ag_state_on_collision"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/reset_pairing_only_for_related_service_discovery_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/reset_pairing_only_for_related_service_discovery_flag_values.textproto
deleted file mode 100644
index 3b15ac19..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/reset_pairing_only_for_related_service_discovery_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "reset_pairing_only_for_related_service_discovery"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/reset_security_flags_on_pairing_failure_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/reset_security_flags_on_pairing_failure_flag_values.textproto
deleted file mode 100644
index 2e4393f8..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/reset_security_flags_on_pairing_failure_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "reset_security_flags_on_pairing_failure"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/respect_ble_scan_setting_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/respect_ble_scan_setting_flag_values.textproto
deleted file mode 100644
index 219fffb7..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/respect_ble_scan_setting_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "respect_ble_scan_setting"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/rfcomm_always_disc_initiator_in_disc_wait_ua_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/rfcomm_always_disc_initiator_in_disc_wait_ua_flag_values.textproto
deleted file mode 100644
index a2028854..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/rfcomm_always_disc_initiator_in_disc_wait_ua_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "rfcomm_always_disc_initiator_in_disc_wait_ua"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/rfcomm_always_use_mitm_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/rfcomm_always_use_mitm_flag_values.textproto
deleted file mode 100644
index 8d7ced3f..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/rfcomm_always_use_mitm_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "rfcomm_always_use_mitm"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/rfcomm_cancel_ongoing_sdp_on_close_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/rfcomm_cancel_ongoing_sdp_on_close_flag_values.textproto
deleted file mode 100644
index 4b710020..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/rfcomm_cancel_ongoing_sdp_on_close_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "rfcomm_cancel_ongoing_sdp_on_close"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/rfcomm_prevent_unnecessary_collisions_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/rfcomm_prevent_unnecessary_collisions_flag_values.textproto
deleted file mode 100644
index 3ed2e9ba..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/rfcomm_prevent_unnecessary_collisions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "rfcomm_prevent_unnecessary_collisions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/rnr_cancel_before_event_race_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/rnr_cancel_before_event_race_flag_values.textproto
deleted file mode 100644
index b6eee145..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/rnr_cancel_before_event_race_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "rnr_cancel_before_event_race"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/rnr_present_during_service_discovery_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/rnr_present_during_service_discovery_flag_values.textproto
deleted file mode 100644
index dba4766a..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/rnr_present_during_service_discovery_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "rnr_present_during_service_discovery"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/rnr_reset_state_at_cancel_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/rnr_reset_state_at_cancel_flag_values.textproto
deleted file mode 100644
index fa8d15b3..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/rnr_reset_state_at_cancel_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "rnr_reset_state_at_cancel"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/rnr_store_device_type_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/rnr_store_device_type_flag_values.textproto
deleted file mode 100644
index 2be52e17..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/rnr_store_device_type_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "rnr_store_device_type"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/rpa_offload_to_bt_controller_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/rpa_offload_to_bt_controller_flag_values.textproto
deleted file mode 100644
index 828164ae..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/rpa_offload_to_bt_controller_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "rpa_offload_to_bt_controller"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/run_ble_audio_ticks_in_worker_thread_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/run_ble_audio_ticks_in_worker_thread_flag_values.textproto
deleted file mode 100644
index 7e02f74d..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/run_ble_audio_ticks_in_worker_thread_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "run_ble_audio_ticks_in_worker_thread"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/run_clock_recovery_in_worker_thread_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/run_clock_recovery_in_worker_thread_flag_values.textproto
deleted file mode 100644
index 2ead8b4a..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/run_clock_recovery_in_worker_thread_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "run_clock_recovery_in_worker_thread"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/same_handler_for_all_modules_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/same_handler_for_all_modules_flag_values.textproto
deleted file mode 100644
index 16c6ecf1..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/same_handler_for_all_modules_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "same_handler_for_all_modules"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/save_initial_hid_connection_policy_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/save_initial_hid_connection_policy_flag_values.textproto
deleted file mode 100644
index af222f4c..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/save_initial_hid_connection_policy_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "save_initial_hid_connection_policy"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/save_peer_csrk_after_ltk_gen_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/save_peer_csrk_after_ltk_gen_flag_values.textproto
deleted file mode 100644
index 54a67c94..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/save_peer_csrk_after_ltk_gen_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "save_peer_csrk_after_ltk_gen"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/scan_record_manufacturer_data_merge_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/scan_record_manufacturer_data_merge_flag_values.textproto
deleted file mode 100644
index 55fdace6..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/scan_record_manufacturer_data_merge_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "scan_record_manufacturer_data_merge"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/scan_results_in_main_thread_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/scan_results_in_main_thread_flag_values.textproto
deleted file mode 100644
index 44df765b..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/scan_results_in_main_thread_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "scan_results_in_main_thread"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/sec_disconnect_on_le_key_missing_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/sec_disconnect_on_le_key_missing_flag_values.textproto
deleted file mode 100644
index be085c6a..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/sec_disconnect_on_le_key_missing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "sec_disconnect_on_le_key_missing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/sec_dont_clear_keys_on_encryption_err_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/sec_dont_clear_keys_on_encryption_err_flag_values.textproto
deleted file mode 100644
index 6ff6cda2..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/sec_dont_clear_keys_on_encryption_err_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "sec_dont_clear_keys_on_encryption_err"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/separate_service_and_device_discovery_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/separate_service_and_device_discovery_flag_values.textproto
deleted file mode 100644
index 2c88f1e5..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/separate_service_and_device_discovery_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "separate_service_and_device_discovery"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/separate_service_storage_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/separate_service_storage_flag_values.textproto
deleted file mode 100644
index 3932d537..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/separate_service_storage_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "separate_service_storage"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/serialize_hogp_and_dis_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/serialize_hogp_and_dis_flag_values.textproto
deleted file mode 100644
index 92eae880..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/serialize_hogp_and_dis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "serialize_hogp_and_dis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/set_addressed_player_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/set_addressed_player_flag_values.textproto
deleted file mode 100644
index 94c70844..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/set_addressed_player_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "set_addressed_player"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/set_component_available_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/set_component_available_fix_flag_values.textproto
deleted file mode 100644
index a1dadb1b..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/set_component_available_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "set_component_available_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/settings_can_control_hap_preset_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/settings_can_control_hap_preset_flag_values.textproto
deleted file mode 100644
index 73c37318..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/settings_can_control_hap_preset_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "settings_can_control_hap_preset"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/signal_connecting_on_focus_gain_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/signal_connecting_on_focus_gain_flag_values.textproto
deleted file mode 100644
index c8aae713..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/signal_connecting_on_focus_gain_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "signal_connecting_on_focus_gain"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/sink_audio_policy_handover_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/sink_audio_policy_handover_flag_values.textproto
deleted file mode 100644
index 822a467a..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/sink_audio_policy_handover_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "sink_audio_policy_handover"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/smp_connection_status_handling_when_no_acl_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/smp_connection_status_handling_when_no_acl_flag_values.textproto
deleted file mode 100644
index c1a6799d..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/smp_connection_status_handling_when_no_acl_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "smp_connection_status_handling_when_no_acl"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/smp_state_machine_stuck_after_disconnection_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/smp_state_machine_stuck_after_disconnection_fix_flag_values.textproto
deleted file mode 100644
index d4d609c5..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/smp_state_machine_stuck_after_disconnection_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "smp_state_machine_stuck_after_disconnection_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/snoop_logger_recreate_logs_directory_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/snoop_logger_recreate_logs_directory_flag_values.textproto
deleted file mode 100644
index 85cf944d..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/snoop_logger_recreate_logs_directory_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "snoop_logger_recreate_logs_directory"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/snoop_logger_tracing_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/snoop_logger_tracing_flag_values.textproto
deleted file mode 100644
index 4e794605..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/snoop_logger_tracing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "snoop_logger_tracing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/socket_settings_api_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/socket_settings_api_flag_values.textproto
deleted file mode 100644
index a7efe2c2..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/socket_settings_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "socket_settings_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/stack_sdp_detect_nil_property_type_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/stack_sdp_detect_nil_property_type_flag_values.textproto
deleted file mode 100644
index 974b890a..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/stack_sdp_detect_nil_property_type_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "stack_sdp_detect_nil_property_type"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/start_discover_service_changed_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/start_discover_service_changed_flag_values.textproto
deleted file mode 100644
index 92cfecad..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/start_discover_service_changed_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "start_discover_service_changed"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/stop_on_offload_fail_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/stop_on_offload_fail_flag_values.textproto
deleted file mode 100644
index fd890b6d..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/stop_on_offload_fail_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "stop_on_offload_fail"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/support_bluetooth_quality_report_v6_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/support_bluetooth_quality_report_v6_flag_values.textproto
deleted file mode 100644
index 59f3885c..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/support_bluetooth_quality_report_v6_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "support_bluetooth_quality_report_v6"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/support_exclusive_manager_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/support_exclusive_manager_flag_values.textproto
deleted file mode 100644
index d5078a61..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/support_exclusive_manager_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "support_exclusive_manager"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/support_metadata_device_types_apis_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/support_metadata_device_types_apis_flag_values.textproto
deleted file mode 100644
index af5384fd..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/support_metadata_device_types_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "support_metadata_device_types_apis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/support_remote_device_metadata_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/support_remote_device_metadata_flag_values.textproto
deleted file mode 100644
index 42173c20..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/support_remote_device_metadata_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "support_remote_device_metadata"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/suppress_hid_rejection_broadcast_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/suppress_hid_rejection_broadcast_flag_values.textproto
deleted file mode 100644
index b488d0b1..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/suppress_hid_rejection_broadcast_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "suppress_hid_rejection_broadcast"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/synchronous_bta_sec_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/synchronous_bta_sec_flag_values.textproto
deleted file mode 100644
index 8b49bfd0..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/synchronous_bta_sec_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "synchronous_bta_sec"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/system_server_remove_extra_thread_jump_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/system_server_remove_extra_thread_jump_flag_values.textproto
deleted file mode 100644
index 03baa9f7..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/system_server_remove_extra_thread_jump_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "system_server_remove_extra_thread_jump"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/temporary_pairing_device_properties_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/temporary_pairing_device_properties_flag_values.textproto
deleted file mode 100644
index 4d79ef61..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/temporary_pairing_device_properties_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "temporary_pairing_device_properties"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/temporary_pairing_tracking_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/temporary_pairing_tracking_flag_values.textproto
deleted file mode 100644
index 23529b05..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/temporary_pairing_tracking_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "temporary_pairing_tracking"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/transmit_smp_packets_before_release_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/transmit_smp_packets_before_release_flag_values.textproto
deleted file mode 100644
index ca575ff1..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/transmit_smp_packets_before_release_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "transmit_smp_packets_before_release"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/unbonded_profile_forbid_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/unbonded_profile_forbid_fix_flag_values.textproto
deleted file mode 100644
index 14f1792c..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/unbonded_profile_forbid_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "unbonded_profile_forbid_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/uncache_player_when_browsed_player_changes_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/uncache_player_when_browsed_player_changes_flag_values.textproto
deleted file mode 100644
index 66c24de8..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/uncache_player_when_browsed_player_changes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "uncache_player_when_browsed_player_changes"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/unix_file_socket_creation_failure_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/unix_file_socket_creation_failure_flag_values.textproto
deleted file mode 100644
index 8c64ee31..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/unix_file_socket_creation_failure_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "unix_file_socket_creation_failure"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/unregister_gatt_client_disconnected_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/unregister_gatt_client_disconnected_flag_values.textproto
deleted file mode 100644
index 03c0876a..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/unregister_gatt_client_disconnected_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "unregister_gatt_client_disconnected"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/update_active_device_in_band_ringtone_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/update_active_device_in_band_ringtone_flag_values.textproto
deleted file mode 100644
index 73370f57..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/update_active_device_in_band_ringtone_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "update_active_device_in_band_ringtone"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/update_inquiry_result_on_flag_change_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/update_inquiry_result_on_flag_change_flag_values.textproto
deleted file mode 100644
index 9c0decaa..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/update_inquiry_result_on_flag_change_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "update_inquiry_result_on_flag_change"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/update_opp_launcher_user_changed_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/update_opp_launcher_user_changed_flag_values.textproto
deleted file mode 100644
index 8c94175f..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/update_opp_launcher_user_changed_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "update_opp_launcher_user_changed"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/update_sco_state_correctly_on_rfcomm_disconnect_during_codec_nego_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/update_sco_state_correctly_on_rfcomm_disconnect_during_codec_nego_flag_values.textproto
deleted file mode 100644
index 04c3c121..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/update_sco_state_correctly_on_rfcomm_disconnect_during_codec_nego_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "update_sco_state_correctly_on_rfcomm_disconnect_during_codec_nego"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/upgrade_temp_bonding_on_auth_req_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/upgrade_temp_bonding_on_auth_req_flag_values.textproto
deleted file mode 100644
index 7e94a8e7..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/upgrade_temp_bonding_on_auth_req_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "upgrade_temp_bonding_on_auth_req"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/use_dsp_codec_when_controller_does_not_support_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/use_dsp_codec_when_controller_does_not_support_flag_values.textproto
deleted file mode 100644
index 01d801f9..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/use_dsp_codec_when_controller_does_not_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "use_dsp_codec_when_controller_does_not_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/use_encrypt_req_for_av_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/use_encrypt_req_for_av_flag_values.textproto
deleted file mode 100644
index 8318221e..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/use_encrypt_req_for_av_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "use_encrypt_req_for_av"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/use_entire_message_handle_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/use_entire_message_handle_flag_values.textproto
deleted file mode 100644
index 08def40a..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/use_entire_message_handle_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "use_entire_message_handle"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/use_local_oob_extended_command_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/use_local_oob_extended_command_flag_values.textproto
deleted file mode 100644
index 755f3506..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/use_local_oob_extended_command_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "use_local_oob_extended_command"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/vcp_allow_set_same_volume_if_pending_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/vcp_allow_set_same_volume_if_pending_flag_values.textproto
deleted file mode 100644
index 2baebd33..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/vcp_allow_set_same_volume_if_pending_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "vcp_allow_set_same_volume_if_pending"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/vcp_device_volume_api_improvements_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/vcp_device_volume_api_improvements_flag_values.textproto
deleted file mode 100644
index be124f74..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/vcp_device_volume_api_improvements_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "vcp_device_volume_api_improvements"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/vcp_mute_unmute_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/vcp_mute_unmute_flag_values.textproto
deleted file mode 100644
index a25db391..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/vcp_mute_unmute_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "vcp_mute_unmute"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/vup_for_pending_connection_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/vup_for_pending_connection_flag_values.textproto
deleted file mode 100644
index b0cf2c83..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/vup_for_pending_connection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "vup_for_pending_connection"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/wait_for_disconnect_before_unbond_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/wait_for_disconnect_before_unbond_flag_values.textproto
deleted file mode 100644
index 8d009b81..00000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/wait_for_disconnect_before_unbond_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "wait_for_disconnect_before_unbond"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.btaudio.hal.flags/Android.bp b/aconfig/trunk_staging/com.android.btaudio.hal.flags/Android.bp
deleted file mode 100644
index e9ef0a66..00000000
--- a/aconfig/trunk_staging/com.android.btaudio.hal.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.btaudio.hal.flags-all",
-  package: "com.android.btaudio.hal.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.btaudio.hal.flags/dsa_lea_flag_values.textproto b/aconfig/trunk_staging/com.android.btaudio.hal.flags/dsa_lea_flag_values.textproto
deleted file mode 100644
index 0b5b34cd..00000000
--- a/aconfig/trunk_staging/com.android.btaudio.hal.flags/dsa_lea_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.btaudio.hal.flags"
-  name: "dsa_lea"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.btaudio.hal.flags/leaudio_report_broadcast_ac_to_hal_flag_values.textproto b/aconfig/trunk_staging/com.android.btaudio.hal.flags/leaudio_report_broadcast_ac_to_hal_flag_values.textproto
deleted file mode 100644
index 8cb114cc..00000000
--- a/aconfig/trunk_staging/com.android.btaudio.hal.flags/leaudio_report_broadcast_ac_to_hal_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.btaudio.hal.flags"
-  name: "leaudio_report_broadcast_ac_to_hal"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.calllogbackup/Android.bp b/aconfig/trunk_staging/com.android.calllogbackup/Android.bp
deleted file mode 100644
index a18c865d..00000000
--- a/aconfig/trunk_staging/com.android.calllogbackup/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.calllogbackup-all",
-    package: "com.android.calllogbackup",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.calllogbackup/batch_deduplication_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.calllogbackup/batch_deduplication_enabled_flag_values.textproto
deleted file mode 100644
index a8410cce..00000000
--- a/aconfig/trunk_staging/com.android.calllogbackup/batch_deduplication_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.calllogbackup"
-  name: "batch_deduplication_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.calllogbackup/call_log_restore_deduplication_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.calllogbackup/call_log_restore_deduplication_enabled_flag_values.textproto
deleted file mode 100644
index 8003bc21..00000000
--- a/aconfig/trunk_staging/com.android.calllogbackup/call_log_restore_deduplication_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.calllogbackup"
-  name: "call_log_restore_deduplication_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.car.carlauncher/Android.bp b/aconfig/trunk_staging/com.android.car.carlauncher/Android.bp
deleted file mode 100644
index 9e7ad32c..00000000
--- a/aconfig/trunk_staging/com.android.car.carlauncher/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.car.carlauncher-all",
-  package: "com.android.car.carlauncher",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.car.carlauncher/calm_mode_flag_values.textproto b/aconfig/trunk_staging/com.android.car.carlauncher/calm_mode_flag_values.textproto
deleted file mode 100644
index 1a5b430e..00000000
--- a/aconfig/trunk_staging/com.android.car.carlauncher/calm_mode_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.car.carlauncher"
-  name: "calm_mode"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.car.carlauncher/media_card_fullscreen_flag_values.textproto b/aconfig/trunk_staging/com.android.car.carlauncher/media_card_fullscreen_flag_values.textproto
deleted file mode 100644
index ba7465d0..00000000
--- a/aconfig/trunk_staging/com.android.car.carlauncher/media_card_fullscreen_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.car.carlauncher"
-  name: "media_card_fullscreen"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.car.carlauncher/media_session_card_flag_values.textproto b/aconfig/trunk_staging/com.android.car.carlauncher/media_session_card_flag_values.textproto
deleted file mode 100644
index 1a20350b..00000000
--- a/aconfig/trunk_staging/com.android.car.carlauncher/media_session_card_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.car.carlauncher"
-  name: "media_session_card"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.car.datasubscription/Android.bp b/aconfig/trunk_staging/com.android.car.datasubscription/Android.bp
deleted file mode 100644
index e0d3c463..00000000
--- a/aconfig/trunk_staging/com.android.car.datasubscription/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.car.datasubscription-all",
-  package: "com.android.car.datasubscription",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.car.datasubscription/data_subscription_pop_up_flag_values.textproto b/aconfig/trunk_staging/com.android.car.datasubscription/data_subscription_pop_up_flag_values.textproto
deleted file mode 100644
index ab571b34..00000000
--- a/aconfig/trunk_staging/com.android.car.datasubscription/data_subscription_pop_up_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.car.datasubscription"
-  name: "data_subscription_pop_up"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.car.dockutil/Android.bp b/aconfig/trunk_staging/com.android.car.dockutil/Android.bp
deleted file mode 100644
index 5a6da451..00000000
--- a/aconfig/trunk_staging/com.android.car.dockutil/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.car.dockutil-all",
-  package: "com.android.car.dockutil",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.car.dockutil/dock_feature_flag_values.textproto b/aconfig/trunk_staging/com.android.car.dockutil/dock_feature_flag_values.textproto
deleted file mode 100644
index f140c976..00000000
--- a/aconfig/trunk_staging/com.android.car.dockutil/dock_feature_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.car.dockutil"
-  name: "dock_feature"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.car.settings/Android.bp b/aconfig/trunk_staging/com.android.car.settings/Android.bp
deleted file mode 100644
index f8dd7314..00000000
--- a/aconfig/trunk_staging/com.android.car.settings/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.car.settings-all",
-  package: "com.android.car.settings",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.car.settings/hotspot_ui_speed_update_flag_values.textproto b/aconfig/trunk_staging/com.android.car.settings/hotspot_ui_speed_update_flag_values.textproto
deleted file mode 100644
index 6e23abd9..00000000
--- a/aconfig/trunk_staging/com.android.car.settings/hotspot_ui_speed_update_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.car.settings"
-  name: "hotspot_ui_speed_update"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.car.settings/microphone_privacy_updates_flag_values.textproto b/aconfig/trunk_staging/com.android.car.settings/microphone_privacy_updates_flag_values.textproto
deleted file mode 100644
index 81c0662c..00000000
--- a/aconfig/trunk_staging/com.android.car.settings/microphone_privacy_updates_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.car.settings"
-  name: "microphone_privacy_updates"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.car.settings/required_infotainment_apps_settings_page_flag_values.textproto b/aconfig/trunk_staging/com.android.car.settings/required_infotainment_apps_settings_page_flag_values.textproto
deleted file mode 100644
index 71ec1ee5..00000000
--- a/aconfig/trunk_staging/com.android.car.settings/required_infotainment_apps_settings_page_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.car.settings"
-  name: "required_infotainment_apps_settings_page"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.car.settings/ui_theme_toggle_flag_values.textproto b/aconfig/trunk_staging/com.android.car.settings/ui_theme_toggle_flag_values.textproto
deleted file mode 100644
index 0425d579..00000000
--- a/aconfig/trunk_staging/com.android.car.settings/ui_theme_toggle_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.car.settings"
-  name: "ui_theme_toggle"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.car.settings/update_date_and_time_page_flag_values.textproto b/aconfig/trunk_staging/com.android.car.settings/update_date_and_time_page_flag_values.textproto
deleted file mode 100644
index a4c26abf..00000000
--- a/aconfig/trunk_staging/com.android.car.settings/update_date_and_time_page_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.car.settings"
-  name: "update_date_and_time_page"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.cellbroadcastreceiver.flags/Android.bp b/aconfig/trunk_staging/com.android.cellbroadcastreceiver.flags/Android.bp
deleted file mode 100644
index 7214119f..00000000
--- a/aconfig/trunk_staging/com.android.cellbroadcastreceiver.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.cellbroadcastreceiver.flags-all",
-  package: "com.android.cellbroadcastreceiver.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.deviceaswebcam.flags/Android.bp b/aconfig/trunk_staging/com.android.deviceaswebcam.flags/Android.bp
deleted file mode 100644
index dffcc1b4..00000000
--- a/aconfig/trunk_staging/com.android.deviceaswebcam.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.deviceaswebcam.flags-all",
-  package: "com.android.deviceaswebcam.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.deviceaswebcam.flags/high_quality_toggle_flag_values.textproto b/aconfig/trunk_staging/com.android.deviceaswebcam.flags/high_quality_toggle_flag_values.textproto
deleted file mode 100644
index d319f606..00000000
--- a/aconfig/trunk_staging/com.android.deviceaswebcam.flags/high_quality_toggle_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.deviceaswebcam.flags"
-  name: "high_quality_toggle"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.devicelock.flags/Android.bp b/aconfig/trunk_staging/com.android.devicelock.flags/Android.bp
deleted file mode 100644
index 23fc0a03..00000000
--- a/aconfig/trunk_staging/com.android.devicelock.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.devicelock.flags-all",
-  package: "com.android.devicelock.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.documentsui.flags/Android.bp b/aconfig/trunk_staging/com.android.documentsui.flags/Android.bp
deleted file mode 100644
index 823f744e..00000000
--- a/aconfig/trunk_staging/com.android.documentsui.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.documentsui.flags-all",
-    package: "com.android.documentsui.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.documentsui.flags/TEST_MAPPING b/aconfig/trunk_staging/com.android.documentsui.flags/TEST_MAPPING
deleted file mode 100644
index 444c6ee3..00000000
--- a/aconfig/trunk_staging/com.android.documentsui.flags/TEST_MAPPING
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "imports": [
-    {
-      "path": "packages/apps/DocumentsUI"
-    }
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.documentsui.flags/redirect_get_content_ro_flag_values.textproto b/aconfig/trunk_staging/com.android.documentsui.flags/redirect_get_content_ro_flag_values.textproto
deleted file mode 100644
index ebdbef82..00000000
--- a/aconfig/trunk_staging/com.android.documentsui.flags/redirect_get_content_ro_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.documentsui.flags"
-  name: "redirect_get_content_ro"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.egg.flags/Android.bp b/aconfig/trunk_staging/com.android.egg.flags/Android.bp
deleted file mode 100644
index 2ae45fe1..00000000
--- a/aconfig/trunk_staging/com.android.egg.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.egg.flags-all",
-  package: "com.android.egg.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.egg.flags/flag_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.egg.flags/flag_flag_flag_values.textproto
deleted file mode 100644
index 2af0cb8e..00000000
--- a/aconfig/trunk_staging/com.android.egg.flags/flag_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.egg.flags"
-  name: "flag_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.ext.services.flags/Android.bp b/aconfig/trunk_staging/com.android.ext.services.flags/Android.bp
deleted file mode 100644
index 78450d6c..00000000
--- a/aconfig/trunk_staging/com.android.ext.services.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.ext.services.flags-all",
-    package: "com.android.ext.services.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.ext.services.flags/text_classifier_for_otp_detection_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.ext.services.flags/text_classifier_for_otp_detection_enabled_flag_values.textproto
deleted file mode 100644
index 508a1f28..00000000
--- a/aconfig/trunk_staging/com.android.ext.services.flags/text_classifier_for_otp_detection_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.ext.services.flags"
-  name: "text_classifier_for_otp_detection_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.frameworks.gpuservice.flags/Android.bp b/aconfig/trunk_staging/com.android.frameworks.gpuservice.flags/Android.bp
deleted file mode 100644
index a2dcad4e..00000000
--- a/aconfig/trunk_staging/com.android.frameworks.gpuservice.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.frameworks.gpuservice.flags-all",
-    package: "com.android.frameworks.gpuservice.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.frameworks.gpuservice.flags/multiuser_permission_check_flag_values.textproto b/aconfig/trunk_staging/com.android.frameworks.gpuservice.flags/multiuser_permission_check_flag_values.textproto
deleted file mode 100644
index 73efaa32..00000000
--- a/aconfig/trunk_staging/com.android.frameworks.gpuservice.flags/multiuser_permission_check_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.frameworks.gpuservice.flags"
-  name: "multiuser_permission_check"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.frameworks.sensorservice.flags/Android.bp b/aconfig/trunk_staging/com.android.frameworks.sensorservice.flags/Android.bp
deleted file mode 100644
index a8f41395..00000000
--- a/aconfig/trunk_staging/com.android.frameworks.sensorservice.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.frameworks.sensorservice.flags-all",
-  package: "com.android.frameworks.sensorservice.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.frameworks.sensorservice.flags/dynamic_sensor_hal_reconnect_handling_flag_values.textproto b/aconfig/trunk_staging/com.android.frameworks.sensorservice.flags/dynamic_sensor_hal_reconnect_handling_flag_values.textproto
deleted file mode 100644
index 9f9a733e..00000000
--- a/aconfig/trunk_staging/com.android.frameworks.sensorservice.flags/dynamic_sensor_hal_reconnect_handling_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.frameworks.sensorservice.flags"
-  name: "dynamic_sensor_hal_reconnect_handling"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.bufferstreams.flags/Android.bp b/aconfig/trunk_staging/com.android.graphics.bufferstreams.flags/Android.bp
deleted file mode 100644
index feb5c304..00000000
--- a/aconfig/trunk_staging/com.android.graphics.bufferstreams.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.graphics.bufferstreams.flags-all",
-  package: "com.android.graphics.bufferstreams.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.egl.flags/Android.bp b/aconfig/trunk_staging/com.android.graphics.egl.flags/Android.bp
deleted file mode 100644
index 411b85fc..00000000
--- a/aconfig/trunk_staging/com.android.graphics.egl.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.graphics.egl.flags-all",
-    package: "com.android.graphics.egl.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.egl.flags/multifile_blobcache_advanced_usage_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.egl.flags/multifile_blobcache_advanced_usage_flag_values.textproto
deleted file mode 100644
index e9099bd7..00000000
--- a/aconfig/trunk_staging/com.android.graphics.egl.flags/multifile_blobcache_advanced_usage_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.egl.flags"
-  name: "multifile_blobcache_advanced_usage"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.flags/Android.bp b/aconfig/trunk_staging/com.android.graphics.flags/Android.bp
deleted file mode 100644
index 4802b84d..00000000
--- a/aconfig/trunk_staging/com.android.graphics.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.graphics.flags-all",
-    package: "com.android.graphics.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.flags/display_bt2020_colorspace_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.flags/display_bt2020_colorspace_flag_values.textproto
deleted file mode 100644
index b3e430b1..00000000
--- a/aconfig/trunk_staging/com.android.graphics.flags/display_bt2020_colorspace_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.flags"
-  name: "display_bt2020_colorspace"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.flags/exact_compute_bounds_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.flags/exact_compute_bounds_flag_values.textproto
deleted file mode 100644
index ce6fa18b..00000000
--- a/aconfig/trunk_staging/com.android.graphics.flags/exact_compute_bounds_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.flags"
-  name: "exact_compute_bounds"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.flags/gradient_drawable_shape_arc_for_rounded_cap_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.flags/gradient_drawable_shape_arc_for_rounded_cap_flag_values.textproto
deleted file mode 100644
index ba7f4bcb..00000000
--- a/aconfig/trunk_staging/com.android.graphics.flags/gradient_drawable_shape_arc_for_rounded_cap_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.flags"
-  name: "gradient_drawable_shape_arc_for_rounded_cap"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.flags/icon_load_drawable_return_null_when_uri_decode_fails_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.flags/icon_load_drawable_return_null_when_uri_decode_fails_flag_values.textproto
deleted file mode 100644
index 47e60015..00000000
--- a/aconfig/trunk_staging/com.android.graphics.flags/icon_load_drawable_return_null_when_uri_decode_fails_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.flags"
-  name: "icon_load_drawable_return_null_when_uri_decode_fails"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.flags/ok_lab_colorspace_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.flags/ok_lab_colorspace_flag_values.textproto
deleted file mode 100644
index 991cc523..00000000
--- a/aconfig/trunk_staging/com.android.graphics.flags/ok_lab_colorspace_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.flags"
-  name: "ok_lab_colorspace"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.flags/yuv_image_compress_to_ultra_hdr_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.flags/yuv_image_compress_to_ultra_hdr_flag_values.textproto
deleted file mode 100644
index d33bbb84..00000000
--- a/aconfig/trunk_staging/com.android.graphics.flags/yuv_image_compress_to_ultra_hdr_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.flags"
-  name: "yuv_image_compress_to_ultra_hdr"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.graphicsenv.flags/Android.bp b/aconfig/trunk_staging/com.android.graphics.graphicsenv.flags/Android.bp
deleted file mode 100644
index decc07b4..00000000
--- a/aconfig/trunk_staging/com.android.graphics.graphicsenv.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.graphics.graphicsenv.flags-all",
-    package: "com.android.graphics.graphicsenv.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.graphicsenv.flags/angle_feature_overrides_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.graphicsenv.flags/angle_feature_overrides_flag_values.textproto
deleted file mode 100644
index 0a1dc190..00000000
--- a/aconfig/trunk_staging/com.android.graphics.graphicsenv.flags/angle_feature_overrides_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.graphicsenv.flags"
-  name: "angle_feature_overrides"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/Android.bp b/aconfig/trunk_staging/com.android.graphics.hwui.flags/Android.bp
deleted file mode 100644
index daa059ce..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.graphics.hwui.flags-all",
-    package: "com.android.graphics.hwui.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/animate_hdr_transitions_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/animate_hdr_transitions_flag_values.textproto
deleted file mode 100644
index f035b647..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/animate_hdr_transitions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "animate_hdr_transitions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/animated_image_drawable_filter_bitmap_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/animated_image_drawable_filter_bitmap_flag_values.textproto
deleted file mode 100644
index f8074e94..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/animated_image_drawable_filter_bitmap_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "animated_image_drawable_filter_bitmap"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/bitmap_ashmem_long_name_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/bitmap_ashmem_long_name_flag_values.textproto
deleted file mode 100644
index 6951c93a..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/bitmap_ashmem_long_name_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "bitmap_ashmem_long_name"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/bitmap_parcel_ashmem_as_immutable_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/bitmap_parcel_ashmem_as_immutable_flag_values.textproto
deleted file mode 100644
index 5762995d..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/bitmap_parcel_ashmem_as_immutable_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "bitmap_parcel_ashmem_as_immutable"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/calc_workload_orig_deadline_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/calc_workload_orig_deadline_flag_values.textproto
deleted file mode 100644
index 3c7625de..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/calc_workload_orig_deadline_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "calc_workload_orig_deadline"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/clip_shader_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/clip_shader_flag_values.textproto
deleted file mode 100644
index 6c36dc07..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/clip_shader_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "clip_shader"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/clip_surfaceviews_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/clip_surfaceviews_flag_values.textproto
deleted file mode 100644
index fa6660e5..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/clip_surfaceviews_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "clip_surfaceviews"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/draw_region_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/draw_region_flag_values.textproto
deleted file mode 100644
index c0d8acca..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/draw_region_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "draw_region"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/early_preinit_buffer_allocator_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/early_preinit_buffer_allocator_flag_values.textproto
deleted file mode 100644
index 340b8ddd..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/early_preinit_buffer_allocator_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "early_preinit_buffer_allocator"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/early_preload_gl_context_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/early_preload_gl_context_flag_values.textproto
deleted file mode 100644
index ee7d1c3b..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/early_preload_gl_context_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "early_preload_gl_context"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/gainmap_animations_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/gainmap_animations_flag_values.textproto
deleted file mode 100644
index 5cb3fb6d..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/gainmap_animations_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "gainmap_animations"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/gainmap_constructor_with_metadata_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/gainmap_constructor_with_metadata_flag_values.textproto
deleted file mode 100644
index acab3029..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/gainmap_constructor_with_metadata_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "gainmap_constructor_with_metadata"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/hdr_10bit_plus_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/hdr_10bit_plus_flag_values.textproto
deleted file mode 100644
index 54d6ca5d..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/hdr_10bit_plus_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "hdr_10bit_plus"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/high_contrast_text_inner_text_color_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/high_contrast_text_inner_text_color_flag_values.textproto
deleted file mode 100644
index cc6c0979..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/high_contrast_text_inner_text_color_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "high_contrast_text_inner_text_color"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/high_contrast_text_luminance_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/high_contrast_text_luminance_flag_values.textproto
deleted file mode 100644
index d0cbda25..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/high_contrast_text_luminance_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "high_contrast_text_luminance"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/high_contrast_text_small_text_rect_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/high_contrast_text_small_text_rect_flag_values.textproto
deleted file mode 100644
index 08cea2b9..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/high_contrast_text_small_text_rect_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "high_contrast_text_small_text_rect"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/initialize_gl_always_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/initialize_gl_always_flag_values.textproto
deleted file mode 100644
index 6cfb0e34..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/initialize_gl_always_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "initialize_gl_always"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/iso_gainmap_apis_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/iso_gainmap_apis_flag_values.textproto
deleted file mode 100644
index 6dce5b69..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/iso_gainmap_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "iso_gainmap_apis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/limited_hdr_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/limited_hdr_flag_values.textproto
deleted file mode 100644
index 2442b280..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/limited_hdr_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "limited_hdr"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/matrix_44_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/matrix_44_flag_values.textproto
deleted file mode 100644
index 4b5e657e..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/matrix_44_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "matrix_44"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/query_global_priority_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/query_global_priority_flag_values.textproto
deleted file mode 100644
index 2500745c..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/query_global_priority_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "query_global_priority"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/remove_vri_sketchy_destroy_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/remove_vri_sketchy_destroy_flag_values.textproto
deleted file mode 100644
index f9396d77..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/remove_vri_sketchy_destroy_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "remove_vri_sketchy_destroy"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/requested_formats_v_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/requested_formats_v_flag_values.textproto
deleted file mode 100644
index 4688a141..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/requested_formats_v_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "requested_formats_v"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/resample_gainmap_regions_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/resample_gainmap_regions_flag_values.textproto
deleted file mode 100644
index 3924fa4d..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/resample_gainmap_regions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "resample_gainmap_regions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/runtime_color_filters_blenders_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/runtime_color_filters_blenders_flag_values.textproto
deleted file mode 100644
index 0649d035..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/runtime_color_filters_blenders_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "runtime_color_filters_blenders"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/skip_eglmanager_telemetry_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/skip_eglmanager_telemetry_flag_values.textproto
deleted file mode 100644
index 9412eb92..00000000
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/skip_eglmanager_telemetry_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.hwui.flags"
-  name: "skip_eglmanager_telemetry"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.libgui.flags/Android.bp b/aconfig/trunk_staging/com.android.graphics.libgui.flags/Android.bp
deleted file mode 100644
index 087783b3..00000000
--- a/aconfig/trunk_staging/com.android.graphics.libgui.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.graphics.libgui.flags-all",
-    package: "com.android.graphics.libgui.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.libgui.flags/allocate_buffer_priority_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.libgui.flags/allocate_buffer_priority_flag_values.textproto
deleted file mode 100644
index 46f9b8ce..00000000
--- a/aconfig/trunk_staging/com.android.graphics.libgui.flags/allocate_buffer_priority_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.libgui.flags"
-  name: "allocate_buffer_priority"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.libgui.flags/apply_picture_profiles_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.libgui.flags/apply_picture_profiles_flag_values.textproto
deleted file mode 100644
index abc75631..00000000
--- a/aconfig/trunk_staging/com.android.graphics.libgui.flags/apply_picture_profiles_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.libgui.flags"
-  name: "apply_picture_profiles"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.libgui.flags/bq_consumer_attach_callback_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.libgui.flags/bq_consumer_attach_callback_flag_values.textproto
deleted file mode 100644
index 4b1eb468..00000000
--- a/aconfig/trunk_staging/com.android.graphics.libgui.flags/bq_consumer_attach_callback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.libgui.flags"
-  name: "bq_consumer_attach_callback"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.libgui.flags/bq_extendedallocate_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.libgui.flags/bq_extendedallocate_flag_values.textproto
deleted file mode 100644
index 9b5427fc..00000000
--- a/aconfig/trunk_staging/com.android.graphics.libgui.flags/bq_extendedallocate_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.libgui.flags"
-  name: "bq_extendedallocate"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.libgui.flags/bq_producer_throttles_only_async_mode_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.libgui.flags/bq_producer_throttles_only_async_mode_flag_values.textproto
deleted file mode 100644
index 29069953..00000000
--- a/aconfig/trunk_staging/com.android.graphics.libgui.flags/bq_producer_throttles_only_async_mode_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.libgui.flags"
-  name: "bq_producer_throttles_only_async_mode"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.libgui.flags/bq_setframerate_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.libgui.flags/bq_setframerate_flag_values.textproto
deleted file mode 100644
index 7da0bdef..00000000
--- a/aconfig/trunk_staging/com.android.graphics.libgui.flags/bq_setframerate_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.libgui.flags"
-  name: "bq_setframerate"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.libgui.flags/buffer_release_channel_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.libgui.flags/buffer_release_channel_flag_values.textproto
deleted file mode 100644
index 9658b22b..00000000
--- a/aconfig/trunk_staging/com.android.graphics.libgui.flags/buffer_release_channel_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.libgui.flags"
-  name: "buffer_release_channel"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.libgui.flags/edge_extension_shader_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.libgui.flags/edge_extension_shader_flag_values.textproto
deleted file mode 100644
index a613f4f3..00000000
--- a/aconfig/trunk_staging/com.android.graphics.libgui.flags/edge_extension_shader_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.libgui.flags"
-  name: "edge_extension_shader"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.libgui.flags/frametimestamps_previousrelease_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.libgui.flags/frametimestamps_previousrelease_flag_values.textproto
deleted file mode 100644
index 03393c20..00000000
--- a/aconfig/trunk_staging/com.android.graphics.libgui.flags/frametimestamps_previousrelease_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.libgui.flags"
-  name: "frametimestamps_previousrelease"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.libgui.flags/trace_frame_rate_override_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.libgui.flags/trace_frame_rate_override_flag_values.textproto
deleted file mode 100644
index 0ab9221f..00000000
--- a/aconfig/trunk_staging/com.android.graphics.libgui.flags/trace_frame_rate_override_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.libgui.flags"
-  name: "trace_frame_rate_override"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.libgui.flags/wb_camera3_and_processors_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.libgui.flags/wb_camera3_and_processors_flag_values.textproto
deleted file mode 100644
index 8c278965..00000000
--- a/aconfig/trunk_staging/com.android.graphics.libgui.flags/wb_camera3_and_processors_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.libgui.flags"
-  name: "wb_camera3_and_processors"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.libgui.flags/wb_consumer_base_owns_bq_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.libgui.flags/wb_consumer_base_owns_bq_flag_values.textproto
deleted file mode 100644
index c72a7520..00000000
--- a/aconfig/trunk_staging/com.android.graphics.libgui.flags/wb_consumer_base_owns_bq_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.libgui.flags"
-  name: "wb_consumer_base_owns_bq"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.libgui.flags/wb_platform_api_improvements_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.libgui.flags/wb_platform_api_improvements_flag_values.textproto
deleted file mode 100644
index 578d4511..00000000
--- a/aconfig/trunk_staging/com.android.graphics.libgui.flags/wb_platform_api_improvements_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.libgui.flags"
-  name: "wb_platform_api_improvements"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.libgui.flags/wb_ring_buffer_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.libgui.flags/wb_ring_buffer_flag_values.textproto
deleted file mode 100644
index a04db561..00000000
--- a/aconfig/trunk_staging/com.android.graphics.libgui.flags/wb_ring_buffer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.libgui.flags"
-  name: "wb_ring_buffer"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.libgui.flags/wb_unlimited_slots_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.libgui.flags/wb_unlimited_slots_flag_values.textproto
deleted file mode 100644
index 60d0e3ac..00000000
--- a/aconfig/trunk_staging/com.android.graphics.libgui.flags/wb_unlimited_slots_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.libgui.flags"
-  name: "wb_unlimited_slots"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.libvulkan.flags/Android.bp b/aconfig/trunk_staging/com.android.graphics.libvulkan.flags/Android.bp
deleted file mode 100644
index 87c9ca34..00000000
--- a/aconfig/trunk_staging/com.android.graphics.libvulkan.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.graphics.libvulkan.flags-all",
-    package: "com.android.graphics.libvulkan.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.libvulkan.flags/swapchain_mutable_format_ext_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.libvulkan.flags/swapchain_mutable_format_ext_flag_values.textproto
deleted file mode 100644
index d8323e69..00000000
--- a/aconfig/trunk_staging/com.android.graphics.libvulkan.flags/swapchain_mutable_format_ext_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.libvulkan.flags"
-  name: "swapchain_mutable_format_ext"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.libvulkan.flags/vulkan_1_4_instance_api_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.libvulkan.flags/vulkan_1_4_instance_api_flag_values.textproto
deleted file mode 100644
index a1d74dd2..00000000
--- a/aconfig/trunk_staging/com.android.graphics.libvulkan.flags/vulkan_1_4_instance_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.libvulkan.flags"
-  name: "vulkan_1_4_instance_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/Android.bp b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/Android.bp
deleted file mode 100644
index a80aeeb6..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.graphics.surfaceflinger.flags-all",
-    package: "com.android.graphics.surfaceflinger.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/TEST_MAPPING b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/TEST_MAPPING
deleted file mode 100644
index d0592d17..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/TEST_MAPPING
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "imports": [
-    {
-      "path": "frameworks/native"
-    },
-    {
-      "path": "frameworks/native/services/surfaceflinger"
-    }
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/add_sf_skipped_frames_to_trace_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/add_sf_skipped_frames_to_trace_flag_values.textproto
deleted file mode 100644
index fcdfedd0..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/add_sf_skipped_frames_to_trace_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "add_sf_skipped_frames_to_trace"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/adpf_fmq_sf_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/adpf_fmq_sf_flag_values.textproto
deleted file mode 100644
index dfd5f4d3..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/adpf_fmq_sf_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "adpf_fmq_sf"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/adpf_gpu_sf_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/adpf_gpu_sf_flag_values.textproto
deleted file mode 100644
index 65fe63aa..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/adpf_gpu_sf_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "adpf_gpu_sf"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/adpf_native_session_manager_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/adpf_native_session_manager_flag_values.textproto
deleted file mode 100644
index ce3b1f95..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/adpf_native_session_manager_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "adpf_native_session_manager"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/allow_n_vsyncs_in_targeter_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/allow_n_vsyncs_in_targeter_flag_values.textproto
deleted file mode 100644
index e53ed7e1..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/allow_n_vsyncs_in_targeter_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "allow_n_vsyncs_in_targeter"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/arr_setframerate_gte_enum_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/arr_setframerate_gte_enum_flag_values.textproto
deleted file mode 100644
index 7b071626..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/arr_setframerate_gte_enum_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "arr_setframerate_gte_enum"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/begone_bright_hlg_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/begone_bright_hlg_flag_values.textproto
deleted file mode 100644
index 38434433..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/begone_bright_hlg_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "begone_bright_hlg"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/cache_when_source_crop_layer_only_moved_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/cache_when_source_crop_layer_only_moved_flag_values.textproto
deleted file mode 100644
index 0128b9b0..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/cache_when_source_crop_layer_only_moved_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "cache_when_source_crop_layer_only_moved"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/ce_fence_promise_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/ce_fence_promise_flag_values.textproto
deleted file mode 100644
index 959898a6..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/ce_fence_promise_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "ce_fence_promise"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/commit_not_composited_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/commit_not_composited_flag_values.textproto
deleted file mode 100644
index 072b4cf2..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/commit_not_composited_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "commit_not_composited"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/connected_display_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/connected_display_flag_values.textproto
deleted file mode 100644
index b79d222b..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/connected_display_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "connected_display"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/connected_display_hdr_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/connected_display_hdr_flag_values.textproto
deleted file mode 100644
index 3c581279..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/connected_display_hdr_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "connected_display_hdr"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/correct_dpi_with_display_size_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/correct_dpi_with_display_size_flag_values.textproto
deleted file mode 100644
index 411d22a7..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/correct_dpi_with_display_size_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "correct_dpi_with_display_size"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/detached_mirror_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/detached_mirror_flag_values.textproto
deleted file mode 100644
index 150a90c4..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/detached_mirror_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "detached_mirror"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/display_config_error_hal_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/display_config_error_hal_flag_values.textproto
deleted file mode 100644
index 20e53c6f..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/display_config_error_hal_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "display_config_error_hal"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/display_protected_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/display_protected_flag_values.textproto
deleted file mode 100644
index 872336d4..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/display_protected_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "display_protected"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/dont_skip_on_early_ro_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/dont_skip_on_early_ro_flag_values.textproto
deleted file mode 100644
index dd11dcf6..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/dont_skip_on_early_ro_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "dont_skip_on_early_ro"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/enable_fro_dependent_features_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/enable_fro_dependent_features_flag_values.textproto
deleted file mode 100644
index 7350f648..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/enable_fro_dependent_features_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "enable_fro_dependent_features"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/enable_layer_command_batching_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/enable_layer_command_batching_flag_values.textproto
deleted file mode 100644
index 0a0cf012..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/enable_layer_command_batching_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "enable_layer_command_batching"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/enable_small_area_detection_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/enable_small_area_detection_flag_values.textproto
deleted file mode 100644
index 84371a89..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/enable_small_area_detection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "enable_small_area_detection"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/filter_frames_before_trace_starts_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/filter_frames_before_trace_starts_flag_values.textproto
deleted file mode 100644
index 6f9b3083..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/filter_frames_before_trace_starts_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "filter_frames_before_trace_starts"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/flush_buffer_slots_to_uncache_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/flush_buffer_slots_to_uncache_flag_values.textproto
deleted file mode 100644
index c42d022e..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/flush_buffer_slots_to_uncache_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "flush_buffer_slots_to_uncache"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/force_compile_graphite_renderengine_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/force_compile_graphite_renderengine_flag_values.textproto
deleted file mode 100644
index 9bfb86dd..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/force_compile_graphite_renderengine_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "force_compile_graphite_renderengine"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/fp16_client_target_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/fp16_client_target_flag_values.textproto
deleted file mode 100644
index 72ba2726..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/fp16_client_target_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "fp16_client_target"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/game_default_frame_rate_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/game_default_frame_rate_flag_values.textproto
deleted file mode 100644
index 88f02ffe..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/game_default_frame_rate_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "game_default_frame_rate"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/hdcp_level_hal_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/hdcp_level_hal_flag_values.textproto
deleted file mode 100644
index 5b4d00d9..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/hdcp_level_hal_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "hdcp_level_hal"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/hotplug2_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/hotplug2_flag_values.textproto
deleted file mode 100644
index 76db86f4..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/hotplug2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "hotplug2"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/latch_unsignaled_with_auto_refresh_changed_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/latch_unsignaled_with_auto_refresh_changed_flag_values.textproto
deleted file mode 100644
index e1a12f0b..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/latch_unsignaled_with_auto_refresh_changed_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "latch_unsignaled_with_auto_refresh_changed"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/local_tonemap_screenshots_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/local_tonemap_screenshots_flag_values.textproto
deleted file mode 100644
index 969fb683..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/local_tonemap_screenshots_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "local_tonemap_screenshots"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/misc1_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/misc1_flag_values.textproto
deleted file mode 100644
index fd44ce32..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/misc1_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "misc1"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/multithreaded_present_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/multithreaded_present_flag_values.textproto
deleted file mode 100644
index 744e5386..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/multithreaded_present_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "multithreaded_present"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/override_trusted_overlay_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/override_trusted_overlay_flag_values.textproto
deleted file mode 100644
index 72fbf162..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/override_trusted_overlay_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "override_trusted_overlay"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/protected_if_client_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/protected_if_client_flag_values.textproto
deleted file mode 100644
index 58c2559c..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/protected_if_client_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "protected_if_client"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/refresh_rate_overlay_on_external_display_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/refresh_rate_overlay_on_external_display_flag_values.textproto
deleted file mode 100644
index 06aef734..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/refresh_rate_overlay_on_external_display_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "refresh_rate_overlay_on_external_display"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/reject_dupe_layerstacks_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/reject_dupe_layerstacks_flag_values.textproto
deleted file mode 100644
index 0336d564..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/reject_dupe_layerstacks_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "reject_dupe_layerstacks"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/restore_blur_step_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/restore_blur_step_flag_values.textproto
deleted file mode 100644
index 68eb33d9..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/restore_blur_step_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "restore_blur_step"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/screenshot_fence_preservation_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/screenshot_fence_preservation_flag_values.textproto
deleted file mode 100644
index d06e1f55..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/screenshot_fence_preservation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "screenshot_fence_preservation"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/single_hop_screenshot_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/single_hop_screenshot_flag_values.textproto
deleted file mode 100644
index 7d3e01e1..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/single_hop_screenshot_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "single_hop_screenshot"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/synced_resolution_switch_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/synced_resolution_switch_flag_values.textproto
deleted file mode 100644
index bc3e7648..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/synced_resolution_switch_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "synced_resolution_switch"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/true_hdr_screenshots_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/true_hdr_screenshots_flag_values.textproto
deleted file mode 100644
index 21c449a6..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/true_hdr_screenshots_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "true_hdr_screenshots"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/view_set_requested_frame_rate_mrr_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/view_set_requested_frame_rate_mrr_flag_values.textproto
deleted file mode 100644
index 86edec58..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/view_set_requested_frame_rate_mrr_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "view_set_requested_frame_rate_mrr"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/vrr_bugfix_24q4_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/vrr_bugfix_24q4_flag_values.textproto
deleted file mode 100644
index c5dd063b..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/vrr_bugfix_24q4_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "vrr_bugfix_24q4"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/vrr_bugfix_dropped_frame_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/vrr_bugfix_dropped_frame_flag_values.textproto
deleted file mode 100644
index 268fe3f9..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/vrr_bugfix_dropped_frame_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "vrr_bugfix_dropped_frame"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/vrr_config_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/vrr_config_flag_values.textproto
deleted file mode 100644
index c4b28785..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/vrr_config_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "vrr_config"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/vsync_predictor_recovery_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/vsync_predictor_recovery_flag_values.textproto
deleted file mode 100644
index d12fc8ee..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/vsync_predictor_recovery_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "vsync_predictor_recovery"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/window_blur_kawase2_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/window_blur_kawase2_flag_values.textproto
deleted file mode 100644
index 23802484..00000000
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/window_blur_kawase2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "window_blur_kawase2"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.camera2/Android.bp b/aconfig/trunk_staging/com.android.hardware.camera2/Android.bp
deleted file mode 100644
index ed0e265b..00000000
--- a/aconfig/trunk_staging/com.android.hardware.camera2/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.hardware.camera2-all",
-  package: "com.android.hardware.camera2",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/Android.bp b/aconfig/trunk_staging/com.android.hardware.input/Android.bp
deleted file mode 100644
index 3b7747fc..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.hardware.input-all",
-    package: "com.android.hardware.input",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/TEST_MAPPING b/aconfig/trunk_staging/com.android.hardware.input/TEST_MAPPING
deleted file mode 100644
index 7c0dc275..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/TEST_MAPPING
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "imports": [
-    {
-      "path": "frameworks/native/services/inputflinger"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/aconfig/trunk_staging/com.android.hardware.input/abort_slow_multi_press_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/abort_slow_multi_press_flag_values.textproto
deleted file mode 100644
index f0425da6..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/abort_slow_multi_press_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.input"
-  name: "abort_slow_multi_press"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/can_window_override_power_gesture_api_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/can_window_override_power_gesture_api_flag_values.textproto
deleted file mode 100644
index d38a9653..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/can_window_override_power_gesture_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.input"
-  name: "can_window_override_power_gesture_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/emoji_and_screenshot_keycodes_available_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/emoji_and_screenshot_keycodes_available_flag_values.textproto
deleted file mode 100644
index 8412aaee..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/emoji_and_screenshot_keycodes_available_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.input"
-  name: "emoji_and_screenshot_keycodes_available"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/enable_customizable_input_gestures_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/enable_customizable_input_gestures_flag_values.textproto
deleted file mode 100644
index 3e5a95c3..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/enable_customizable_input_gestures_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.input"
-  name: "enable_customizable_input_gestures"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/enable_new_25q2_keycodes_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/enable_new_25q2_keycodes_flag_values.textproto
deleted file mode 100644
index 36e33323..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/enable_new_25q2_keycodes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.input"
-  name: "enable_new_25q2_keycodes"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/input_manager_lifecycle_support_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/input_manager_lifecycle_support_flag_values.textproto
deleted file mode 100644
index b1becc04..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/input_manager_lifecycle_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.input"
-  name: "input_manager_lifecycle_support"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/keyboard_a11y_bounce_keys_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/keyboard_a11y_bounce_keys_flag_flag_values.textproto
deleted file mode 100644
index 5068e71d..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/keyboard_a11y_bounce_keys_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.input"
-  name: "keyboard_a11y_bounce_keys_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/keyboard_a11y_mouse_keys_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/keyboard_a11y_mouse_keys_flag_values.textproto
deleted file mode 100644
index bb651441..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/keyboard_a11y_mouse_keys_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.input"
-  name: "keyboard_a11y_mouse_keys"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/keyboard_a11y_shortcut_control_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/keyboard_a11y_shortcut_control_flag_values.textproto
deleted file mode 100644
index 222c3e12..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/keyboard_a11y_shortcut_control_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.input"
-  name: "keyboard_a11y_shortcut_control"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/keyboard_a11y_slow_keys_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/keyboard_a11y_slow_keys_flag_flag_values.textproto
deleted file mode 100644
index db8be2ef..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/keyboard_a11y_slow_keys_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.input"
-  name: "keyboard_a11y_slow_keys_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/keyboard_a11y_sticky_keys_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/keyboard_a11y_sticky_keys_flag_flag_values.textproto
deleted file mode 100644
index 0be91722..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/keyboard_a11y_sticky_keys_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.input"
-  name: "keyboard_a11y_sticky_keys_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/keyboard_glyph_map_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/keyboard_glyph_map_flag_values.textproto
deleted file mode 100644
index 6d621e65..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/keyboard_glyph_map_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.input"
-  name: "keyboard_glyph_map"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/keyboard_layout_manager_multi_user_ime_setup_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/keyboard_layout_manager_multi_user_ime_setup_flag_values.textproto
deleted file mode 100644
index 8965e289..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/keyboard_layout_manager_multi_user_ime_setup_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.input"
-  name: "keyboard_layout_manager_multi_user_ime_setup"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/keyboard_layout_preview_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/keyboard_layout_preview_flag_flag_values.textproto
deleted file mode 100644
index 78ef24d2..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/keyboard_layout_preview_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.input"
-  name: "keyboard_layout_preview_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/manage_key_gestures_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/manage_key_gestures_flag_values.textproto
deleted file mode 100644
index f2f5b604..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/manage_key_gestures_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.input"
-  name: "manage_key_gestures"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/modifier_shortcut_dump_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/modifier_shortcut_dump_flag_values.textproto
deleted file mode 100644
index 6e4dd5c5..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/modifier_shortcut_dump_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.input"
-  name: "modifier_shortcut_dump"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/modifier_shortcut_manager_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/modifier_shortcut_manager_refactor_flag_values.textproto
deleted file mode 100644
index 02f983c5..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/modifier_shortcut_manager_refactor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.input"
-  name: "modifier_shortcut_manager_refactor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/pointer_coords_is_resampled_api_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/pointer_coords_is_resampled_api_flag_values.textproto
deleted file mode 100644
index 15fb9eed..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/pointer_coords_is_resampled_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.input"
-  name: "pointer_coords_is_resampled_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/touchpad_system_gesture_disable_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/touchpad_system_gesture_disable_flag_values.textproto
deleted file mode 100644
index 5e6ff3d8..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/touchpad_system_gesture_disable_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.input"
-  name: "touchpad_system_gesture_disable"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/touchpad_tap_dragging_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/touchpad_tap_dragging_flag_values.textproto
deleted file mode 100644
index 0a321496..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/touchpad_tap_dragging_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.input"
-  name: "touchpad_tap_dragging"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/touchpad_three_finger_tap_shortcut_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/touchpad_three_finger_tap_shortcut_flag_values.textproto
deleted file mode 100644
index 07115460..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/touchpad_three_finger_tap_shortcut_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.input"
-  name: "touchpad_three_finger_tap_shortcut"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/touchpad_visualizer_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/touchpad_visualizer_flag_values.textproto
deleted file mode 100644
index bc9f76e7..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/touchpad_visualizer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.input"
-  name: "touchpad_visualizer"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/use_key_gesture_event_handler_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/use_key_gesture_event_handler_flag_values.textproto
deleted file mode 100644
index 6b018e7e..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/use_key_gesture_event_handler_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.input"
-  name: "use_key_gesture_event_handler"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/use_key_gesture_event_handler_multi_key_gestures_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/use_key_gesture_event_handler_multi_key_gestures_flag_values.textproto
deleted file mode 100644
index c1d4e947..00000000
--- a/aconfig/trunk_staging/com.android.hardware.input/use_key_gesture_event_handler_multi_key_gestures_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.input"
-  name: "use_key_gesture_event_handler_multi_key_gestures"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.libsensor.flags/Android.bp b/aconfig/trunk_staging/com.android.hardware.libsensor.flags/Android.bp
deleted file mode 100644
index 1b1599eb..00000000
--- a/aconfig/trunk_staging/com.android.hardware.libsensor.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.hardware.libsensor.flags-all",
-  package: "com.android.hardware.libsensor.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.libsensor.flags/sensor_event_queue_report_sensor_usage_in_tracing_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.libsensor.flags/sensor_event_queue_report_sensor_usage_in_tracing_flag_values.textproto
deleted file mode 100644
index 9cdbca5f..00000000
--- a/aconfig/trunk_staging/com.android.hardware.libsensor.flags/sensor_event_queue_report_sensor_usage_in_tracing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.libsensor.flags"
-  name: "sensor_event_queue_report_sensor_usage_in_tracing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.hardware.libsensor.flags/sensormanager_ping_binder_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.libsensor.flags/sensormanager_ping_binder_flag_values.textproto
deleted file mode 100644
index 57115a26..00000000
--- a/aconfig/trunk_staging/com.android.hardware.libsensor.flags/sensormanager_ping_binder_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.hardware.libsensor.flags"
-  name: "sensormanager_ping_binder"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthconnect.flags/Android.bp b/aconfig/trunk_staging/com.android.healthconnect.flags/Android.bp
deleted file mode 100644
index 37e02bf0..00000000
--- a/aconfig/trunk_staging/com.android.healthconnect.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.healthconnect.flags-all",
-  package: "com.android.healthconnect.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.healthconnect.flags/background_read_flag_values.textproto b/aconfig/trunk_staging/com.android.healthconnect.flags/background_read_flag_values.textproto
deleted file mode 100644
index 4e536653..00000000
--- a/aconfig/trunk_staging/com.android.healthconnect.flags/background_read_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthconnect.flags"
-  name: "background_read"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthconnect.flags/history_read_flag_values.textproto b/aconfig/trunk_staging/com.android.healthconnect.flags/history_read_flag_values.textproto
deleted file mode 100644
index 28f972ca..00000000
--- a/aconfig/trunk_staging/com.android.healthconnect.flags/history_read_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthconnect.flags"
-  name: "history_read"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthconnect.flags/read_exercise_routes_all_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.healthconnect.flags/read_exercise_routes_all_enabled_flag_values.textproto
deleted file mode 100644
index ffd7982c..00000000
--- a/aconfig/trunk_staging/com.android.healthconnect.flags/read_exercise_routes_all_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthconnect.flags"
-  name: "read_exercise_routes_all_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthconnect.flags/skin_temperature_flag_values.textproto b/aconfig/trunk_staging/com.android.healthconnect.flags/skin_temperature_flag_values.textproto
deleted file mode 100644
index 5320e105..00000000
--- a/aconfig/trunk_staging/com.android.healthconnect.flags/skin_temperature_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthconnect.flags"
-  name: "skin_temperature"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthconnect.flags/training_plans_flag_values.textproto b/aconfig/trunk_staging/com.android.healthconnect.flags/training_plans_flag_values.textproto
deleted file mode 100644
index 586ff236..00000000
--- a/aconfig/trunk_staging/com.android.healthconnect.flags/training_plans_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthconnect.flags"
-  name: "training_plans"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/Android.bp b/aconfig/trunk_staging/com.android.healthfitness.flags/Android.bp
deleted file mode 100644
index 7779651a..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.healthfitness.flags-all",
-    package: "com.android.healthfitness.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/TEST_MAPPING b/aconfig/trunk_staging/com.android.healthfitness.flags/TEST_MAPPING
deleted file mode 100644
index 4cf4fe5c..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/TEST_MAPPING
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "imports": [
-    {
-      "path": "packages/modules/HealthFitness"
-    }
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/activity_intensity_db_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/activity_intensity_db_flag_values.textproto
deleted file mode 100644
index e3d89ca1..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/activity_intensity_db_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "activity_intensity_db"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/activity_intensity_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/activity_intensity_flag_values.textproto
deleted file mode 100644
index c5cf8749..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/activity_intensity_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "activity_intensity"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/add_missing_access_logs_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/add_missing_access_logs_flag_values.textproto
deleted file mode 100644
index eabf3c84..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/add_missing_access_logs_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "add_missing_access_logs"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/clear_caches_after_switching_user_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/clear_caches_after_switching_user_flag_values.textproto
deleted file mode 100644
index f62b651f..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/clear_caches_after_switching_user_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "clear_caches_after_switching_user"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/cloud_backup_and_restore_db_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/cloud_backup_and_restore_db_flag_values.textproto
deleted file mode 100644
index 5d5f4645..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/cloud_backup_and_restore_db_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "cloud_backup_and_restore_db"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/cloud_backup_and_restore_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/cloud_backup_and_restore_flag_values.textproto
deleted file mode 100644
index eccfba32..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/cloud_backup_and_restore_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "cloud_backup_and_restore"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/d2d_file_deletion_bug_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/d2d_file_deletion_bug_fix_flag_values.textproto
deleted file mode 100644
index 45314515..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/d2d_file_deletion_bug_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "d2d_file_deletion_bug_fix"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/dependency_injection_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/dependency_injection_flag_values.textproto
deleted file mode 100644
index 4410ac6b..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/dependency_injection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "dependency_injection"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/development_database_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/development_database_flag_values.textproto
deleted file mode 100644
index 7939dd93..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/development_database_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "development_database"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/ecosystem_metrics_db_changes_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/ecosystem_metrics_db_changes_flag_values.textproto
deleted file mode 100644
index d1bcca88..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/ecosystem_metrics_db_changes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "ecosystem_metrics_db_changes"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/ecosystem_metrics_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/ecosystem_metrics_flag_values.textproto
deleted file mode 100644
index c807af08..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/ecosystem_metrics_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "ecosystem_metrics"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/export_import_fast_follow_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/export_import_fast_follow_flag_values.textproto
deleted file mode 100644
index 1fd2a83b..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/export_import_fast_follow_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "export_import_fast_follow"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/export_import_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/export_import_flag_values.textproto
deleted file mode 100644
index b851fa5e..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/export_import_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "export_import"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/expressive_theming_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/expressive_theming_enabled_flag_values.textproto
deleted file mode 100644
index ec22bd05..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/expressive_theming_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "expressive_theming_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/health_connect_mappings_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/health_connect_mappings_flag_values.textproto
deleted file mode 100644
index b919b687..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/health_connect_mappings_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "health_connect_mappings"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/immediate_export_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/immediate_export_flag_values.textproto
deleted file mode 100644
index dd79b04d..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/immediate_export_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "immediate_export"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/infra_to_guard_db_changes_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/infra_to_guard_db_changes_flag_values.textproto
deleted file mode 100644
index 3cd7efda..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/infra_to_guard_db_changes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "infra_to_guard_db_changes"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/logcat_censor_iae_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/logcat_censor_iae_flag_values.textproto
deleted file mode 100644
index b01b1ed2..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/logcat_censor_iae_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "logcat_censor_iae"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/mindfulness_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/mindfulness_flag_values.textproto
deleted file mode 100644
index 76b9aee5..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/mindfulness_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "mindfulness"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/new_information_architecture_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/new_information_architecture_flag_values.textproto
deleted file mode 100644
index 943650a7..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/new_information_architecture_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "new_information_architecture"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/permission_metrics_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/permission_metrics_flag_values.textproto
deleted file mode 100644
index 517a6347..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/permission_metrics_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "permission_metrics"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/permission_tracker_fix_mapping_init_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/permission_tracker_fix_mapping_init_flag_values.textproto
deleted file mode 100644
index a9fe3f1e..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/permission_tracker_fix_mapping_init_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "permission_tracker_fix_mapping_init"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_database_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_database_flag_values.textproto
deleted file mode 100644
index 7f0c997e..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_database_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "personal_health_record_database"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_disable_d2d_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_disable_d2d_flag_values.textproto
deleted file mode 100644
index 37846991..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_disable_d2d_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "personal_health_record_disable_d2d"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_disable_export_import_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_disable_export_import_flag_values.textproto
deleted file mode 100644
index 475cb02e..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_disable_export_import_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "personal_health_record_disable_export_import"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_enable_d2d_and_export_import_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_enable_d2d_and_export_import_flag_values.textproto
deleted file mode 100644
index 48ea2cd1..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_enable_d2d_and_export_import_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "personal_health_record_enable_d2d_and_export_import"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_enable_export_import_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_enable_export_import_flag_values.textproto
deleted file mode 100644
index 301611af..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_enable_export_import_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "personal_health_record_enable_export_import"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_entries_screen_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_entries_screen_flag_values.textproto
deleted file mode 100644
index 2772cc90..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_entries_screen_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "personal_health_record_entries_screen"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_flag_values.textproto
deleted file mode 100644
index 605397b3..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "personal_health_record"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_lock_screen_banner_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_lock_screen_banner_flag_values.textproto
deleted file mode 100644
index 92bdbbe0..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_lock_screen_banner_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "personal_health_record_lock_screen_banner"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_telemetry_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_telemetry_flag_values.textproto
deleted file mode 100644
index b1254773..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_telemetry_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "personal_health_record_telemetry"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_telemetry_private_ww_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_telemetry_private_ww_flag_values.textproto
deleted file mode 100644
index aa658346..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_telemetry_private_ww_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "personal_health_record_telemetry_private_ww"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_ui_telemetry_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_ui_telemetry_flag_values.textproto
deleted file mode 100644
index a96c0ac0..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_ui_telemetry_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "personal_health_record_ui_telemetry"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/phr_fhir_basic_complex_type_validation_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/phr_fhir_basic_complex_type_validation_flag_values.textproto
deleted file mode 100644
index ae03b7a2..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/phr_fhir_basic_complex_type_validation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "phr_fhir_basic_complex_type_validation"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/phr_fhir_complex_type_validation_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/phr_fhir_complex_type_validation_flag_values.textproto
deleted file mode 100644
index 12a88ca6..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/phr_fhir_complex_type_validation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "phr_fhir_complex_type_validation"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/phr_fhir_extension_validation_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/phr_fhir_extension_validation_flag_values.textproto
deleted file mode 100644
index 6616b697..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/phr_fhir_extension_validation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "phr_fhir_extension_validation"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/phr_fhir_primitive_type_validation_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/phr_fhir_primitive_type_validation_flag_values.textproto
deleted file mode 100644
index 22078ae9..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/phr_fhir_primitive_type_validation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "phr_fhir_primitive_type_validation"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/phr_fhir_resource_validator_use_weak_reference_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/phr_fhir_resource_validator_use_weak_reference_flag_values.textproto
deleted file mode 100644
index 330e3f26..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/phr_fhir_resource_validator_use_weak_reference_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "phr_fhir_resource_validator_use_weak_reference"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/phr_fhir_structural_validation_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/phr_fhir_structural_validation_flag_values.textproto
deleted file mode 100644
index 77504c81..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/phr_fhir_structural_validation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "phr_fhir_structural_validation"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/phr_fhir_validation_disallow_empty_objects_arrays_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/phr_fhir_validation_disallow_empty_objects_arrays_flag_values.textproto
deleted file mode 100644
index 6334a7f6..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/phr_fhir_validation_disallow_empty_objects_arrays_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "phr_fhir_validation_disallow_empty_objects_arrays"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/phr_read_medical_resources_fix_query_limit_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/phr_read_medical_resources_fix_query_limit_flag_values.textproto
deleted file mode 100644
index 36315cf6..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/phr_read_medical_resources_fix_query_limit_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "phr_read_medical_resources_fix_query_limit"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/phr_upsert_fix_parcel_size_calculation_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/phr_upsert_fix_parcel_size_calculation_flag_values.textproto
deleted file mode 100644
index 31ae5dcb..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/phr_upsert_fix_parcel_size_calculation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "phr_upsert_fix_parcel_size_calculation"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/phr_upsert_fix_use_shared_memory_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/phr_upsert_fix_use_shared_memory_flag_values.textproto
deleted file mode 100644
index 28852894..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/phr_upsert_fix_use_shared_memory_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "phr_upsert_fix_use_shared_memory"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/read_assets_for_disabled_apps_from_package_manager_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/read_assets_for_disabled_apps_from_package_manager_flag_values.textproto
deleted file mode 100644
index fea7933d..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/read_assets_for_disabled_apps_from_package_manager_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "read_assets_for_disabled_apps_from_package_manager"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/replace_body_sensor_permission_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/replace_body_sensor_permission_enabled_flag_values.textproto
deleted file mode 100644
index 49c3f8e8..00000000
--- a/aconfig/trunk_staging/com.android.healthfitness.flags/replace_body_sensor_permission_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.healthfitness.flags"
-  name: "replace_body_sensor_permission_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.icu/Android.bp b/aconfig/trunk_staging/com.android.icu/Android.bp
deleted file mode 100644
index 49557bfc..00000000
--- a/aconfig/trunk_staging/com.android.icu/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.icu-all",
-    package: "com.android.icu",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.icu/icu_25q2_api_flag_values.textproto b/aconfig/trunk_staging/com.android.icu/icu_25q2_api_flag_values.textproto
deleted file mode 100644
index 66db1c86..00000000
--- a/aconfig/trunk_staging/com.android.icu/icu_25q2_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.icu"
-  name: "icu_25q2_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.icu/icu_v_api_flag_values.textproto b/aconfig/trunk_staging/com.android.icu/icu_v_api_flag_values.textproto
deleted file mode 100644
index 6b24e554..00000000
--- a/aconfig/trunk_staging/com.android.icu/icu_v_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.icu"
-  name: "icu_v_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.icu/telephony_lookup_mcc_extension_flag_values.textproto b/aconfig/trunk_staging/com.android.icu/telephony_lookup_mcc_extension_flag_values.textproto
deleted file mode 100644
index 4444e77f..00000000
--- a/aconfig/trunk_staging/com.android.icu/telephony_lookup_mcc_extension_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.icu"
-  name: "telephony_lookup_mcc_extension"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/Android.bp b/aconfig/trunk_staging/com.android.input.flags/Android.bp
deleted file mode 100644
index b4d40448..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.input.flags-all",
-    package: "com.android.input.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/TEST_MAPPING b/aconfig/trunk_staging/com.android.input.flags/TEST_MAPPING
deleted file mode 100644
index 7c0dc275..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/TEST_MAPPING
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "imports": [
-    {
-      "path": "frameworks/native/services/inputflinger"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/aconfig/trunk_staging/com.android.input.flags/a11y_crash_on_inconsistent_event_stream_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/a11y_crash_on_inconsistent_event_stream_flag_values.textproto
deleted file mode 100644
index 39300d32..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/a11y_crash_on_inconsistent_event_stream_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "a11y_crash_on_inconsistent_event_stream"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/allow_transfer_of_entire_gesture_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/allow_transfer_of_entire_gesture_flag_values.textproto
deleted file mode 100644
index 8a72620d..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/allow_transfer_of_entire_gesture_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "allow_transfer_of_entire_gesture"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/connected_displays_associated_display_cursor_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/connected_displays_associated_display_cursor_bugfix_flag_values.textproto
deleted file mode 100644
index 32065413..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/connected_displays_associated_display_cursor_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "connected_displays_associated_display_cursor_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/connected_displays_cursor_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/connected_displays_cursor_flag_values.textproto
deleted file mode 100644
index 493b9c19..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/connected_displays_cursor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "connected_displays_cursor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/device_associations_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/device_associations_flag_values.textproto
deleted file mode 100644
index 8ab795be..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/device_associations_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "device_associations"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/disable_touch_input_mapper_pointer_usage_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/disable_touch_input_mapper_pointer_usage_flag_values.textproto
deleted file mode 100644
index a820311e..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/disable_touch_input_mapper_pointer_usage_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "disable_touch_input_mapper_pointer_usage"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/enable_gestures_library_timer_provider_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/enable_gestures_library_timer_provider_flag_values.textproto
deleted file mode 100644
index 091c8fa2..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/enable_gestures_library_timer_provider_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "enable_gestures_library_timer_provider"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/enable_input_event_tracing_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/enable_input_event_tracing_flag_values.textproto
deleted file mode 100644
index 73d1ddd9..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/enable_input_event_tracing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "enable_input_event_tracing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/enable_input_filter_rust_impl_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/enable_input_filter_rust_impl_flag_values.textproto
deleted file mode 100644
index 73a0a9db..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/enable_input_filter_rust_impl_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "enable_input_filter_rust_impl"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/enable_input_policy_profile_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/enable_input_policy_profile_flag_values.textproto
deleted file mode 100644
index eddf3a24..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/enable_input_policy_profile_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "enable_input_policy_profile"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/enable_keyboard_classifier_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/enable_keyboard_classifier_flag_values.textproto
deleted file mode 100644
index bff3ac31..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/enable_keyboard_classifier_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "enable_keyboard_classifier"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/enable_multi_device_input_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/enable_multi_device_input_flag_values.textproto
deleted file mode 100644
index af985feb..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/enable_multi_device_input_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "enable_multi_device_input"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/enable_multi_device_same_window_stream_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/enable_multi_device_same_window_stream_flag_values.textproto
deleted file mode 100644
index 8e5c0de7..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/enable_multi_device_same_window_stream_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "enable_multi_device_same_window_stream"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/enable_new_mouse_pointer_ballistics_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/enable_new_mouse_pointer_ballistics_flag_values.textproto
deleted file mode 100644
index da5484fa..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/enable_new_mouse_pointer_ballistics_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "enable_new_mouse_pointer_ballistics"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/enable_per_device_input_latency_metrics_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/enable_per_device_input_latency_metrics_flag_values.textproto
deleted file mode 100644
index ebaae0af..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/enable_per_device_input_latency_metrics_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "enable_per_device_input_latency_metrics"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/enable_prediction_pruning_via_jerk_thresholding_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/enable_prediction_pruning_via_jerk_thresholding_flag_values.textproto
deleted file mode 100644
index bc331743..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/enable_prediction_pruning_via_jerk_thresholding_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "enable_prediction_pruning_via_jerk_thresholding"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/enable_touchpad_fling_stop_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/enable_touchpad_fling_stop_flag_values.textproto
deleted file mode 100644
index a3707b33..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/enable_touchpad_fling_stop_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "enable_touchpad_fling_stop"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/enable_touchpad_no_focus_change_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/enable_touchpad_no_focus_change_flag_values.textproto
deleted file mode 100644
index 4d9c0cf2..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/enable_touchpad_no_focus_change_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "enable_touchpad_no_focus_change"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/enable_touchpad_typing_palm_rejection_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/enable_touchpad_typing_palm_rejection_flag_values.textproto
deleted file mode 100644
index f07a8574..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/enable_touchpad_typing_palm_rejection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "enable_touchpad_typing_palm_rejection"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/enable_v2_touchpad_typing_palm_rejection_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/enable_v2_touchpad_typing_palm_rejection_flag_values.textproto
deleted file mode 100644
index baa15b8f..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/enable_v2_touchpad_typing_palm_rejection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "enable_v2_touchpad_typing_palm_rejection"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/hide_pointer_indicators_for_secure_windows_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/hide_pointer_indicators_for_secure_windows_flag_values.textproto
deleted file mode 100644
index 47fd022a..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/hide_pointer_indicators_for_secure_windows_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "hide_pointer_indicators_for_secure_windows"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/include_relative_axis_values_for_captured_touchpads_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/include_relative_axis_values_for_captured_touchpads_flag_values.textproto
deleted file mode 100644
index f9cfaf8f..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/include_relative_axis_values_for_captured_touchpads_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "include_relative_axis_values_for_captured_touchpads"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/input_device_view_behavior_api_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/input_device_view_behavior_api_flag_values.textproto
deleted file mode 100644
index 7ef29f7c..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/input_device_view_behavior_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "input_device_view_behavior_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/keyboard_repeat_keys_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/keyboard_repeat_keys_flag_values.textproto
deleted file mode 100644
index 216b6e31..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/keyboard_repeat_keys_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "keyboard_repeat_keys"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/override_key_behavior_permission_apis_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/override_key_behavior_permission_apis_flag_values.textproto
deleted file mode 100644
index 3f10be63..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/override_key_behavior_permission_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "override_key_behavior_permission_apis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/prevent_merging_input_pointer_devices_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/prevent_merging_input_pointer_devices_flag_values.textproto
deleted file mode 100644
index 46091f82..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/prevent_merging_input_pointer_devices_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "prevent_merging_input_pointer_devices"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/rate_limit_user_activity_poke_in_dispatcher_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/rate_limit_user_activity_poke_in_dispatcher_flag_values.textproto
deleted file mode 100644
index 864dc99a..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/rate_limit_user_activity_poke_in_dispatcher_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "rate_limit_user_activity_poke_in_dispatcher"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/remove_input_channel_from_windowstate_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/remove_input_channel_from_windowstate_flag_values.textproto
deleted file mode 100644
index d6a0ab76..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/remove_input_channel_from_windowstate_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "remove_input_channel_from_windowstate"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/remove_pointer_event_tracking_in_wm_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/remove_pointer_event_tracking_in_wm_flag_values.textproto
deleted file mode 100644
index f49f6c82..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/remove_pointer_event_tracking_in_wm_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "remove_pointer_event_tracking_in_wm"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/report_palms_to_gestures_library_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/report_palms_to_gestures_library_flag_values.textproto
deleted file mode 100644
index d0f48829..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/report_palms_to_gestures_library_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "report_palms_to_gestures_library"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/rotary_input_telemetry_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/rotary_input_telemetry_flag_values.textproto
deleted file mode 100644
index 932548fe..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/rotary_input_telemetry_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "rotary_input_telemetry"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/split_all_touches_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/split_all_touches_flag_values.textproto
deleted file mode 100644
index b1a60fdd..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/split_all_touches_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "split_all_touches"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/use_cloned_screen_coordinates_as_raw_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/use_cloned_screen_coordinates_as_raw_flag_values.textproto
deleted file mode 100644
index 2297a36b..00000000
--- a/aconfig/trunk_staging/com.android.input.flags/use_cloned_screen_coordinates_as_raw_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "use_cloned_screen_coordinates_as_raw"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/Android.bp b/aconfig/trunk_staging/com.android.intentresolver/Android.bp
deleted file mode 100644
index 07725aa4..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.intentresolver-all",
-    package: "com.android.intentresolver",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/announce_shareousel_item_list_position_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/announce_shareousel_item_list_position_flag_values.textproto
deleted file mode 100644
index 0695faa6..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/announce_shareousel_item_list_position_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "announce_shareousel_item_list_position"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/announce_shortcuts_and_suggested_apps_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/announce_shortcuts_and_suggested_apps_flag_values.textproto
deleted file mode 100644
index 71bcc171..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/announce_shortcuts_and_suggested_apps_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "announce_shortcuts_and_suggested_apps"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/bespoke_label_view_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/bespoke_label_view_flag_values.textproto
deleted file mode 100644
index 40dc3d95..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/bespoke_label_view_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "bespoke_label_view"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/enable_private_profile_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/enable_private_profile_flag_values.textproto
deleted file mode 100644
index 76d68297..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/enable_private_profile_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "enable_private_profile"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/fix_drawer_offset_on_config_change_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/fix_drawer_offset_on_config_change_flag_values.textproto
deleted file mode 100644
index bca2af87..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/fix_drawer_offset_on_config_change_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "fix_drawer_offset_on_config_change"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/fix_empty_state_padding_bug_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/fix_empty_state_padding_bug_flag_values.textproto
deleted file mode 100644
index c592ec71..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/fix_empty_state_padding_bug_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "fix_empty_state_padding_bug"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/fix_empty_state_padding_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/fix_empty_state_padding_flag_values.textproto
deleted file mode 100644
index e92e2ae3..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/fix_empty_state_padding_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "fix_empty_state_padding"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/fix_missing_drawer_offset_calculation_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/fix_missing_drawer_offset_calculation_flag_values.textproto
deleted file mode 100644
index a2a466ba..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/fix_missing_drawer_offset_calculation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "fix_missing_drawer_offset_calculation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/fix_partial_image_edit_transition_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/fix_partial_image_edit_transition_flag_values.textproto
deleted file mode 100644
index 6edc1f4c..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/fix_partial_image_edit_transition_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "fix_partial_image_edit_transition"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/fix_private_space_locked_on_restart_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/fix_private_space_locked_on_restart_flag_values.textproto
deleted file mode 100644
index 13482c16..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/fix_private_space_locked_on_restart_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "fix_private_space_locked_on_restart"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/fix_shortcut_loader_job_leak_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/fix_shortcut_loader_job_leak_flag_values.textproto
deleted file mode 100644
index a1a7bf37..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/fix_shortcut_loader_job_leak_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "fix_shortcut_loader_job_leak"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/fix_shortcuts_flashing_fixed_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/fix_shortcuts_flashing_fixed_flag_values.textproto
deleted file mode 100644
index 88eb3619..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/fix_shortcuts_flashing_fixed_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "fix_shortcuts_flashing_fixed"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/fix_target_list_footer_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/fix_target_list_footer_flag_values.textproto
deleted file mode 100644
index bb7cdf9c..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/fix_target_list_footer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "fix_target_list_footer"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/individual_metadata_title_read_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/individual_metadata_title_read_flag_values.textproto
deleted file mode 100644
index 816263f5..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/individual_metadata_title_read_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "individual_metadata_title_read"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/keyboard_navigation_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/keyboard_navigation_fix_flag_values.textproto
deleted file mode 100644
index f8537112..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/keyboard_navigation_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "keyboard_navigation_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/modular_framework_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/modular_framework_flag_values.textproto
deleted file mode 100644
index 09e948d7..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/modular_framework_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "modular_framework"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/preview_image_loader_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/preview_image_loader_flag_values.textproto
deleted file mode 100644
index 124ac287..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/preview_image_loader_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "preview_image_loader"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/rebuild_adapters_on_target_pinning_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/rebuild_adapters_on_target_pinning_flag_values.textproto
deleted file mode 100644
index 0b0e2a4e..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/rebuild_adapters_on_target_pinning_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "rebuild_adapters_on_target_pinning"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/refine_system_actions_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/refine_system_actions_flag_values.textproto
deleted file mode 100644
index 051bc454..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/refine_system_actions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "refine_system_actions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/save_shareousel_state_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/save_shareousel_state_flag_values.textproto
deleted file mode 100644
index 082c80e8..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/save_shareousel_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "save_shareousel_state"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/shareousel_scroll_offscreen_selections_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/shareousel_scroll_offscreen_selections_flag_values.textproto
deleted file mode 100644
index 111fbbfd..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/shareousel_scroll_offscreen_selections_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "shareousel_scroll_offscreen_selections"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/shareousel_tap_to_scroll_support_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/shareousel_tap_to_scroll_support_flag_values.textproto
deleted file mode 100644
index 96acd3c1..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/shareousel_tap_to_scroll_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "shareousel_tap_to_scroll_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/shareousel_update_exclude_components_extra_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/shareousel_update_exclude_components_extra_flag_values.textproto
deleted file mode 100644
index 9132a2e6..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/shareousel_update_exclude_components_extra_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "shareousel_update_exclude_components_extra"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/target_hover_and_keyboard_focus_states_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/target_hover_and_keyboard_focus_states_flag_values.textproto
deleted file mode 100644
index ee62b001..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/target_hover_and_keyboard_focus_states_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "target_hover_and_keyboard_focus_states"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/unselect_final_item_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/unselect_final_item_flag_values.textproto
deleted file mode 100644
index 6776e36b..00000000
--- a/aconfig/trunk_staging/com.android.intentresolver/unselect_final_item_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "unselect_final_item"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/Android.bp b/aconfig/trunk_staging/com.android.internal.camera.flags/Android.bp
deleted file mode 100644
index 09446f66..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.internal.camera.flags-all",
-    package: "com.android.internal.camera.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/ae_priority_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/ae_priority_flag_values.textproto
deleted file mode 100644
index fdcdc835..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/ae_priority_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "ae_priority"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/analytics_24q3_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/analytics_24q3_flag_values.textproto
deleted file mode 100644
index 5b719ed7..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/analytics_24q3_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "analytics_24q3"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/api1_release_binderlock_before_cameraservice_disconnect_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/api1_release_binderlock_before_cameraservice_disconnect_flag_values.textproto
deleted file mode 100644
index fe48ec9c..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/api1_release_binderlock_before_cameraservice_disconnect_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "api1_release_binderlock_before_cameraservice_disconnect"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/bump_preview_frame_space_priority_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/bump_preview_frame_space_priority_flag_values.textproto
deleted file mode 100644
index f214b62b..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/bump_preview_frame_space_priority_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "bump_preview_frame_space_priority"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/cache_permission_services_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/cache_permission_services_flag_values.textproto
deleted file mode 100644
index 96173bb0..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/cache_permission_services_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "cache_permission_services"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/calculate_perf_override_during_session_support_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/calculate_perf_override_during_session_support_flag_values.textproto
deleted file mode 100644
index 78a74651..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/calculate_perf_override_during_session_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "calculate_perf_override_during_session_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/camera_ae_mode_low_light_boost_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/camera_ae_mode_low_light_boost_flag_values.textproto
deleted file mode 100644
index f97cce5f..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/camera_ae_mode_low_light_boost_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "camera_ae_mode_low_light_boost"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/camera_device_setup_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/camera_device_setup_flag_values.textproto
deleted file mode 100644
index 522a5c81..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/camera_device_setup_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "camera_device_setup"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/camera_extensions_characteristics_get_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/camera_extensions_characteristics_get_flag_values.textproto
deleted file mode 100644
index e2da994b..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/camera_extensions_characteristics_get_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "camera_extensions_characteristics_get"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/camera_heif_gainmap_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/camera_heif_gainmap_flag_values.textproto
deleted file mode 100644
index 365a1c73..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/camera_heif_gainmap_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "camera_heif_gainmap"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/camera_hsum_permission_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/camera_hsum_permission_flag_values.textproto
deleted file mode 100644
index a3097022..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/camera_hsum_permission_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "camera_hsum_permission"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/camera_manual_flash_strength_control_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/camera_manual_flash_strength_control_flag_values.textproto
deleted file mode 100644
index b668c298..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/camera_manual_flash_strength_control_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "camera_manual_flash_strength_control"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/camera_multi_client_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/camera_multi_client_flag_values.textproto
deleted file mode 100644
index 0183e1fa..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/camera_multi_client_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "camera_multi_client"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/camera_privacy_allowlist_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/camera_privacy_allowlist_flag_values.textproto
deleted file mode 100644
index 717d9535..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/camera_privacy_allowlist_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "camera_privacy_allowlist"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/check_session_support_before_session_char_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/check_session_support_before_session_char_flag_values.textproto
deleted file mode 100644
index 0db84e6a..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/check_session_support_before_session_char_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "check_session_support_before_session_char"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/color_temperature_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/color_temperature_flag_values.textproto
deleted file mode 100644
index 13f62123..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/color_temperature_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "color_temperature"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/concert_mode_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/concert_mode_flag_values.textproto
deleted file mode 100644
index 78bc43b8..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/concert_mode_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "concert_mode"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/data_delivery_permission_checks_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/data_delivery_permission_checks_flag_values.textproto
deleted file mode 100644
index 66a37a18..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/data_delivery_permission_checks_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "data_delivery_permission_checks"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/delay_lazy_hal_instantiation_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/delay_lazy_hal_instantiation_flag_values.textproto
deleted file mode 100644
index 61e470b7..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/delay_lazy_hal_instantiation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "delay_lazy_hal_instantiation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/depth_jpeg_extensions_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/depth_jpeg_extensions_flag_values.textproto
deleted file mode 100644
index 8217f315..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/depth_jpeg_extensions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "depth_jpeg_extensions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/dumpsys_request_stream_ids_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/dumpsys_request_stream_ids_flag_values.textproto
deleted file mode 100644
index c430063f..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/dumpsys_request_stream_ids_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "dumpsys_request_stream_ids"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/enable_hal_abort_from_cameraservicewatchdog_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/enable_hal_abort_from_cameraservicewatchdog_flag_values.textproto
deleted file mode 100644
index e4b513b8..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/enable_hal_abort_from_cameraservicewatchdog_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "enable_hal_abort_from_cameraservicewatchdog"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/enable_stream_reconfiguration_for_unchanged_streams_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/enable_stream_reconfiguration_for_unchanged_streams_flag_values.textproto
deleted file mode 100644
index f0eb0ca0..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/enable_stream_reconfiguration_for_unchanged_streams_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "enable_stream_reconfiguration_for_unchanged_streams"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/extension_10_bit_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/extension_10_bit_flag_values.textproto
deleted file mode 100644
index c7b8ebdf..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/extension_10_bit_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "extension_10_bit"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/feature_combination_baklava_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/feature_combination_baklava_flag_values.textproto
deleted file mode 100644
index 41f9e24a..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/feature_combination_baklava_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "feature_combination_baklava"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/feature_combination_query_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/feature_combination_query_flag_values.textproto
deleted file mode 100644
index d68fe9c5..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/feature_combination_query_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "feature_combination_query"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/fmq_metadata_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/fmq_metadata_flag_values.textproto
deleted file mode 100644
index 3b3aaa60..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/fmq_metadata_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "fmq_metadata"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/inject_session_params_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/inject_session_params_flag_values.textproto
deleted file mode 100644
index db8860fa..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/inject_session_params_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "inject_session_params"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/lazy_aidl_wait_for_service_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/lazy_aidl_wait_for_service_flag_values.textproto
deleted file mode 100644
index 97de2403..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/lazy_aidl_wait_for_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "lazy_aidl_wait_for_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/log_ultrawide_usage_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/log_ultrawide_usage_flag_values.textproto
deleted file mode 100644
index 3a1577a3..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/log_ultrawide_usage_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "log_ultrawide_usage"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/log_zoom_override_usage_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/log_zoom_override_usage_flag_values.textproto
deleted file mode 100644
index 9daa87d6..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/log_zoom_override_usage_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "log_zoom_override_usage"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/metadata_resize_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/metadata_resize_fix_flag_values.textproto
deleted file mode 100644
index 0d41755a..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/metadata_resize_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "metadata_resize_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/mirror_mode_shared_surfaces_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/mirror_mode_shared_surfaces_flag_values.textproto
deleted file mode 100644
index 2c921cc7..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/mirror_mode_shared_surfaces_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "mirror_mode_shared_surfaces"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/multi_res_raw_reprocessing_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/multi_res_raw_reprocessing_flag_values.textproto
deleted file mode 100644
index 56d24e18..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/multi_res_raw_reprocessing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "multi_res_raw_reprocessing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/multiresolution_imagereader_usage_config_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/multiresolution_imagereader_usage_config_flag_values.textproto
deleted file mode 100644
index f7e57069..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/multiresolution_imagereader_usage_config_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "multiresolution_imagereader_usage_config"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/multiresolution_imagereader_usage_public_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/multiresolution_imagereader_usage_public_flag_values.textproto
deleted file mode 100644
index 343f9e07..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/multiresolution_imagereader_usage_public_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "multiresolution_imagereader_usage_public"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/night_mode_indicator_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/night_mode_indicator_flag_values.textproto
deleted file mode 100644
index ddec2d0c..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/night_mode_indicator_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "night_mode_indicator"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/realtime_priority_bump_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/realtime_priority_bump_flag_values.textproto
deleted file mode 100644
index 4e51cad4..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/realtime_priority_bump_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "realtime_priority_bump"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/return_buffers_outside_locks_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/return_buffers_outside_locks_flag_values.textproto
deleted file mode 100644
index a355a17f..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/return_buffers_outside_locks_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "return_buffers_outside_locks"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/session_hal_buf_manager_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/session_hal_buf_manager_flag_values.textproto
deleted file mode 100644
index e6fb6c34..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/session_hal_buf_manager_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "session_hal_buf_manager"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/single_thread_executor_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/single_thread_executor_flag_values.textproto
deleted file mode 100644
index caa225a6..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/single_thread_executor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "single_thread_executor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/single_thread_executor_naming_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/single_thread_executor_naming_flag_values.textproto
deleted file mode 100644
index 532ec605..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/single_thread_executor_naming_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "single_thread_executor_naming"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/surface_ipc_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/surface_ipc_flag_values.textproto
deleted file mode 100644
index f95e3f77..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/surface_ipc_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "surface_ipc"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/surface_leak_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/surface_leak_fix_flag_values.textproto
deleted file mode 100644
index 9dcf979b..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/surface_leak_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "surface_leak_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/use_ro_board_api_level_for_vndk_version_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/use_ro_board_api_level_for_vndk_version_flag_values.textproto
deleted file mode 100644
index e2778f71..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/use_ro_board_api_level_for_vndk_version_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "use_ro_board_api_level_for_vndk_version"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/use_system_api_for_vndk_version_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/use_system_api_for_vndk_version_flag_values.textproto
deleted file mode 100644
index 0e4cc5ad..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/use_system_api_for_vndk_version_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "use_system_api_for_vndk_version"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/watch_foreground_changes_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/watch_foreground_changes_flag_values.textproto
deleted file mode 100644
index 4a7bc869..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/watch_foreground_changes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "watch_foreground_changes"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/zoom_method_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/zoom_method_flag_values.textproto
deleted file mode 100644
index e88d0d18..00000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/zoom_method_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "zoom_method"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.compat.flags/Android.bp b/aconfig/trunk_staging/com.android.internal.compat.flags/Android.bp
deleted file mode 100644
index 5535acc6..00000000
--- a/aconfig/trunk_staging/com.android.internal.compat.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.internal.compat.flags-all",
-  package: "com.android.internal.compat.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.internal.compat.flags/skip_old_and_disabled_compat_logging_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.compat.flags/skip_old_and_disabled_compat_logging_flag_values.textproto
deleted file mode 100644
index 125df20e..00000000
--- a/aconfig/trunk_staging/com.android.internal.compat.flags/skip_old_and_disabled_compat_logging_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.compat.flags"
-  name: "skip_old_and_disabled_compat_logging"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.internal.foldables.flags/Android.bp b/aconfig/trunk_staging/com.android.internal.foldables.flags/Android.bp
deleted file mode 100644
index a39e4405..00000000
--- a/aconfig/trunk_staging/com.android.internal.foldables.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.internal.foldables.flags-all",
-  package: "com.android.internal.foldables.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.internal.foldables.flags/fold_grace_period_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.foldables.flags/fold_grace_period_enabled_flag_values.textproto
deleted file mode 100644
index d8a64ee0..00000000
--- a/aconfig/trunk_staging/com.android.internal.foldables.flags/fold_grace_period_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.foldables.flags"
-  name: "fold_grace_period_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.internal.foldables.flags/fold_lock_setting_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.foldables.flags/fold_lock_setting_enabled_flag_values.textproto
deleted file mode 100644
index 68cc7a3e..00000000
--- a/aconfig/trunk_staging/com.android.internal.foldables.flags/fold_lock_setting_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.foldables.flags"
-  name: "fold_lock_setting_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.internal.jank/Android.bp b/aconfig/trunk_staging/com.android.internal.jank/Android.bp
deleted file mode 100644
index 30bab2a6..00000000
--- a/aconfig/trunk_staging/com.android.internal.jank/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.internal.jank-all",
-    package: "com.android.internal.jank",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.internal.jank/ignore_hwui_is_first_frame_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.jank/ignore_hwui_is_first_frame_flag_values.textproto
deleted file mode 100644
index 663fdfff..00000000
--- a/aconfig/trunk_staging/com.android.internal.jank/ignore_hwui_is_first_frame_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.jank"
-  name: "ignore_hwui_is_first_frame"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.internal.jank/use_sf_frame_duration_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.jank/use_sf_frame_duration_flag_values.textproto
deleted file mode 100644
index 0aa58d84..00000000
--- a/aconfig/trunk_staging/com.android.internal.jank/use_sf_frame_duration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.jank"
-  name: "use_sf_frame_duration"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.internal.os/Android.bp b/aconfig/trunk_staging/com.android.internal.os/Android.bp
deleted file mode 100644
index 05f68f42..00000000
--- a/aconfig/trunk_staging/com.android.internal.os/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.internal.os-all",
-    package: "com.android.internal.os",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.internal.os/application_shared_memory_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.os/application_shared_memory_enabled_flag_values.textproto
deleted file mode 100644
index 6f543128..00000000
--- a/aconfig/trunk_staging/com.android.internal.os/application_shared_memory_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.os"
-  name: "application_shared_memory_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.internal.os/debug_store_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.os/debug_store_enabled_flag_values.textproto
deleted file mode 100644
index fbf3e961..00000000
--- a/aconfig/trunk_staging/com.android.internal.os/debug_store_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.os"
-  name: "debug_store_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.internal.os/enable_apache_http_legacy_preload_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.os/enable_apache_http_legacy_preload_flag_values.textproto
deleted file mode 100644
index 193c3dc8..00000000
--- a/aconfig/trunk_staging/com.android.internal.os/enable_apache_http_legacy_preload_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.os"
-  name: "enable_apache_http_legacy_preload"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.internal.os/enable_media_and_location_preload_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.os/enable_media_and_location_preload_flag_values.textproto
deleted file mode 100644
index b92ed9fe..00000000
--- a/aconfig/trunk_staging/com.android.internal.os/enable_media_and_location_preload_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.os"
-  name: "enable_media_and_location_preload"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.os/ravenwood_flag_ro_2_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.os/ravenwood_flag_ro_2_flag_values.textproto
deleted file mode 100644
index 31e38f0e..00000000
--- a/aconfig/trunk_staging/com.android.internal.os/ravenwood_flag_ro_2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.os"
-  name: "ravenwood_flag_ro_2"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.internal.os/ravenwood_flag_rw_2_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.os/ravenwood_flag_rw_2_flag_values.textproto
deleted file mode 100644
index ba3f05e6..00000000
--- a/aconfig/trunk_staging/com.android.internal.os/ravenwood_flag_rw_2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.os"
-  name: "ravenwood_flag_rw_2"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.os/use_transaction_codes_for_unknown_methods_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.os/use_transaction_codes_for_unknown_methods_flag_values.textproto
deleted file mode 100644
index ead161f3..00000000
--- a/aconfig/trunk_staging/com.android.internal.os/use_transaction_codes_for_unknown_methods_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.os"
-  name: "use_transaction_codes_for_unknown_methods"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.internal.pm.pkg.component.flags/Android.bp b/aconfig/trunk_staging/com.android.internal.pm.pkg.component.flags/Android.bp
deleted file mode 100644
index 7e5d1c30..00000000
--- a/aconfig/trunk_staging/com.android.internal.pm.pkg.component.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.internal.pm.pkg.component.flags-all",
-  package: "com.android.internal.pm.pkg.component.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.internal.pm.pkg.component.flags/enable_per_process_use_embedded_dex_attr_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.pm.pkg.component.flags/enable_per_process_use_embedded_dex_attr_flag_values.textproto
deleted file mode 100644
index 38bf2db7..00000000
--- a/aconfig/trunk_staging/com.android.internal.pm.pkg.component.flags/enable_per_process_use_embedded_dex_attr_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.pm.pkg.component.flags"
-  name: "enable_per_process_use_embedded_dex_attr"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/Android.bp b/aconfig/trunk_staging/com.android.internal.telephony.flags/Android.bp
deleted file mode 100644
index a56eb119..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.internal.telephony.flags-all",
-    package: "com.android.internal.telephony.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/action_sim_preference_settings_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/action_sim_preference_settings_flag_values.textproto
deleted file mode 100644
index c3a841d4..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/action_sim_preference_settings_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "action_sim_preference_settings"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/add_anomaly_when_notify_config_changed_with_invalid_phone_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/add_anomaly_when_notify_config_changed_with_invalid_phone_flag_values.textproto
deleted file mode 100644
index 8ef81bae..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/add_anomaly_when_notify_config_changed_with_invalid_phone_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "add_anomaly_when_notify_config_changed_with_invalid_phone"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/add_ims_redial_codes_for_emergency_calls_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/add_ims_redial_codes_for_emergency_calls_flag_values.textproto
deleted file mode 100644
index 6fdae5a6..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/add_ims_redial_codes_for_emergency_calls_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "add_ims_redial_codes_for_emergency_calls"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/add_rat_related_suggested_action_to_ims_registration_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/add_rat_related_suggested_action_to_ims_registration_flag_values.textproto
deleted file mode 100644
index 59a29265..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/add_rat_related_suggested_action_to_ims_registration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "add_rat_related_suggested_action_to_ims_registration"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/allow_mmtel_in_non_vops_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/allow_mmtel_in_non_vops_flag_values.textproto
deleted file mode 100644
index 9414e4a4..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/allow_mmtel_in_non_vops_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "allow_mmtel_in_non_vops"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/answer_audio_only_when_answering_via_mmi_code_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/answer_audio_only_when_answering_via_mmi_code_flag_values.textproto
deleted file mode 100644
index abbb04fd..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/answer_audio_only_when_answering_via_mmi_code_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "answer_audio_only_when_answering_via_mmi_code"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/ap_domain_selection_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/ap_domain_selection_enabled_flag_values.textproto
deleted file mode 100644
index ed5f3397..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/ap_domain_selection_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "ap_domain_selection_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/apn_setting_field_support_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/apn_setting_field_support_flag_flag_values.textproto
deleted file mode 100644
index 4ab49350..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/apn_setting_field_support_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "apn_setting_field_support_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/async_init_carrier_privileges_tracker_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/async_init_carrier_privileges_tracker_flag_values.textproto
deleted file mode 100644
index 8f764480..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/async_init_carrier_privileges_tracker_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "async_init_carrier_privileges_tracker"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/auto_data_switch_allow_roaming_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/auto_data_switch_allow_roaming_flag_values.textproto
deleted file mode 100644
index ea02a9b1..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/auto_data_switch_allow_roaming_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "auto_data_switch_allow_roaming"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/auto_data_switch_enhanced_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/auto_data_switch_enhanced_flag_values.textproto
deleted file mode 100644
index 08637d2e..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/auto_data_switch_enhanced_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "auto_data_switch_enhanced"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/auto_data_switch_uses_data_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/auto_data_switch_uses_data_enabled_flag_values.textproto
deleted file mode 100644
index 12f4e939..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/auto_data_switch_uses_data_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "auto_data_switch_uses_data_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/avoid_deleting_ims_object_from_cache_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/avoid_deleting_ims_object_from_cache_flag_values.textproto
deleted file mode 100644
index c6bf50a3..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/avoid_deleting_ims_object_from_cache_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "avoid_deleting_ims_object_from_cache"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/backup_and_restore_for_enable_2g_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/backup_and_restore_for_enable_2g_flag_values.textproto
deleted file mode 100644
index 8ed81b3d..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/backup_and_restore_for_enable_2g_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "backup_and_restore_for_enable_2g"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/call_extra_for_non_hold_supported_carriers_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/call_extra_for_non_hold_supported_carriers_flag_values.textproto
deleted file mode 100644
index db299dfd..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/call_extra_for_non_hold_supported_carriers_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "call_extra_for_non_hold_supported_carriers"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/carrier_config_changed_callback_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/carrier_config_changed_callback_fix_flag_values.textproto
deleted file mode 100644
index 6eccd9a0..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/carrier_config_changed_callback_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "carrier_config_changed_callback_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/carrier_enabled_satellite_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/carrier_enabled_satellite_flag_flag_values.textproto
deleted file mode 100644
index 369dc7ae..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/carrier_enabled_satellite_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "carrier_enabled_satellite_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/carrier_id_from_carrier_identifier_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/carrier_id_from_carrier_identifier_flag_values.textproto
deleted file mode 100644
index 53fdae93..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/carrier_id_from_carrier_identifier_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "carrier_id_from_carrier_identifier"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/carrier_restriction_rules_enhancement_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/carrier_restriction_rules_enhancement_flag_values.textproto
deleted file mode 100644
index 83d4b083..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/carrier_restriction_rules_enhancement_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "carrier_restriction_rules_enhancement"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/carrier_restriction_status_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/carrier_restriction_status_flag_values.textproto
deleted file mode 100644
index 3b89ebe3..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/carrier_restriction_status_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "carrier_restriction_status"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/carrier_roaming_nb_iot_ntn_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/carrier_roaming_nb_iot_ntn_flag_values.textproto
deleted file mode 100644
index ae3b7473..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/carrier_roaming_nb_iot_ntn_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "carrier_roaming_nb_iot_ntn"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/cellular_identifier_disclosure_indications_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/cellular_identifier_disclosure_indications_flag_values.textproto
deleted file mode 100644
index 1ad64518..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/cellular_identifier_disclosure_indications_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "cellular_identifier_disclosure_indications"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/change_method_of_obtaining_ims_registration_radio_tech_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/change_method_of_obtaining_ims_registration_radio_tech_flag_values.textproto
deleted file mode 100644
index 932d2e86..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/change_method_of_obtaining_ims_registration_radio_tech_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "change_method_of_obtaining_ims_registration_radio_tech"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/cleanup_carrier_app_update_enabled_state_logic_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/cleanup_carrier_app_update_enabled_state_logic_flag_values.textproto
deleted file mode 100644
index 9d0479d3..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/cleanup_carrier_app_update_enabled_state_logic_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "cleanup_carrier_app_update_enabled_state_logic"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/cleanup_cdma_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/cleanup_cdma_flag_values.textproto
deleted file mode 100644
index 9c52fdb3..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/cleanup_cdma_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "cleanup_cdma"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/cleanup_open_logical_channel_record_on_dispose_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/cleanup_open_logical_channel_record_on_dispose_flag_values.textproto
deleted file mode 100644
index 3f984fd9..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/cleanup_open_logical_channel_record_on_dispose_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "cleanup_open_logical_channel_record_on_dispose"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/clear_cached_ims_phone_number_when_device_lost_ims_registration_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/clear_cached_ims_phone_number_when_device_lost_ims_registration_flag_values.textproto
deleted file mode 100644
index ec21861c..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/clear_cached_ims_phone_number_when_device_lost_ims_registration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "clear_cached_ims_phone_number_when_device_lost_ims_registration"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/combine_ril_death_handle_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/combine_ril_death_handle_flag_values.textproto
deleted file mode 100644
index 2deacf2e..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/combine_ril_death_handle_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "combine_ril_death_handle"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/conference_hold_unhold_changed_to_send_message_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/conference_hold_unhold_changed_to_send_message_flag_values.textproto
deleted file mode 100644
index 44c2a934..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/conference_hold_unhold_changed_to_send_message_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "conference_hold_unhold_changed_to_send_message"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/data_call_session_stats_captures_cross_sim_calling_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/data_call_session_stats_captures_cross_sim_calling_flag_values.textproto
deleted file mode 100644
index 933094d1..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/data_call_session_stats_captures_cross_sim_calling_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "data_call_session_stats_captures_cross_sim_calling"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/data_only_cellular_service_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/data_only_cellular_service_flag_values.textproto
deleted file mode 100644
index 544c3930..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/data_only_cellular_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "data_only_cellular_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/data_only_service_allow_emergency_call_only_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/data_only_service_allow_emergency_call_only_flag_values.textproto
deleted file mode 100644
index ec13d53a..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/data_only_service_allow_emergency_call_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "data_only_service_allow_emergency_call_only"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/data_rat_metric_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/data_rat_metric_enabled_flag_values.textproto
deleted file mode 100644
index 939043e6..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/data_rat_metric_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "data_rat_metric_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/data_service_check_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/data_service_check_flag_values.textproto
deleted file mode 100644
index 53c6581f..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/data_service_check_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "data_service_check"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/dds_callback_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/dds_callback_flag_values.textproto
deleted file mode 100644
index e94af58d..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/dds_callback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "dds_callback"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/delay_phone_account_registration_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/delay_phone_account_registration_flag_values.textproto
deleted file mode 100644
index 718bdb3f..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/delay_phone_account_registration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "delay_phone_account_registration"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/deprecate_cdma_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/deprecate_cdma_flag_values.textproto
deleted file mode 100644
index 095e6bd2..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/deprecate_cdma_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "deprecate_cdma"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/disable_carrier_network_change_on_carrier_app_lost_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/disable_carrier_network_change_on_carrier_app_lost_flag_values.textproto
deleted file mode 100644
index 739e16d6..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/disable_carrier_network_change_on_carrier_app_lost_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "disable_carrier_network_change_on_carrier_app_lost"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/disable_ecbm_based_on_rat_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/disable_ecbm_based_on_rat_flag_values.textproto
deleted file mode 100644
index 2244c1c8..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/disable_ecbm_based_on_rat_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "disable_ecbm_based_on_rat"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/dismiss_network_selection_notification_on_sim_disable_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/dismiss_network_selection_notification_on_sim_disable_flag_values.textproto
deleted file mode 100644
index b3c580b3..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/dismiss_network_selection_notification_on_sim_disable_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "dismiss_network_selection_notification_on_sim_disable"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/do_not_override_precise_label_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/do_not_override_precise_label_flag_values.textproto
deleted file mode 100644
index 8e2deed6..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/do_not_override_precise_label_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "do_not_override_precise_label"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/dsrs_diagnostics_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/dsrs_diagnostics_enabled_flag_values.textproto
deleted file mode 100644
index da0b6556..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/dsrs_diagnostics_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "dsrs_diagnostics_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/dynamic_do_not_ask_again_text_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/dynamic_do_not_ask_again_text_flag_values.textproto
deleted file mode 100644
index e63026bd..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/dynamic_do_not_ask_again_text_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "dynamic_do_not_ask_again_text"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/emergency_callback_mode_notification_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/emergency_callback_mode_notification_flag_values.textproto
deleted file mode 100644
index 2f47ce6c..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/emergency_callback_mode_notification_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "emergency_callback_mode_notification"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/emergency_registration_state_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/emergency_registration_state_flag_values.textproto
deleted file mode 100644
index 5e9cbb8f..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/emergency_registration_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "emergency_registration_state"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_aead_algorithms_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_aead_algorithms_flag_values.textproto
deleted file mode 100644
index 769cce04..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_aead_algorithms_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "enable_aead_algorithms"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_carrier_config_n1_control_attempt2_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_carrier_config_n1_control_attempt2_flag_values.textproto
deleted file mode 100644
index 0815f670..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_carrier_config_n1_control_attempt2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "enable_carrier_config_n1_control_attempt2"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_identifier_disclosure_transparency_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_identifier_disclosure_transparency_flag_values.textproto
deleted file mode 100644
index d67c46ca..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_identifier_disclosure_transparency_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "enable_identifier_disclosure_transparency"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_identifier_disclosure_transparency_unsol_events_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_identifier_disclosure_transparency_unsol_events_flag_values.textproto
deleted file mode 100644
index 65a0c005..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_identifier_disclosure_transparency_unsol_events_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "enable_identifier_disclosure_transparency_unsol_events"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_modem_cipher_transparency_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_modem_cipher_transparency_flag_values.textproto
deleted file mode 100644
index 839ffaf7..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_modem_cipher_transparency_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "enable_modem_cipher_transparency"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_modem_cipher_transparency_unsol_events_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_modem_cipher_transparency_unsol_events_flag_values.textproto
deleted file mode 100644
index 22842ce0..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_modem_cipher_transparency_unsol_events_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "enable_modem_cipher_transparency_unsol_events"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_multiple_sa_proposals_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_multiple_sa_proposals_flag_values.textproto
deleted file mode 100644
index b309718b..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_multiple_sa_proposals_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "enable_multiple_sa_proposals"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_sip_subscribe_retry_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_sip_subscribe_retry_flag_values.textproto
deleted file mode 100644
index 42a09fbc..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_sip_subscribe_retry_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "enable_sip_subscribe_retry"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_telephony_analytics_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_telephony_analytics_flag_values.textproto
deleted file mode 100644
index 72ee9b09..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_telephony_analytics_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "enable_telephony_analytics"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_wps_check_api_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_wps_check_api_flag_flag_values.textproto
deleted file mode 100644
index f19213b2..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_wps_check_api_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "enable_wps_check_api_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/enforce_telephony_feature_mapping_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/enforce_telephony_feature_mapping_flag_values.textproto
deleted file mode 100644
index 4f1d72f8..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/enforce_telephony_feature_mapping_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "enforce_telephony_feature_mapping"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/enforce_telephony_feature_mapping_for_public_apis_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/enforce_telephony_feature_mapping_for_public_apis_flag_values.textproto
deleted file mode 100644
index 6e233377..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/enforce_telephony_feature_mapping_for_public_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "enforce_telephony_feature_mapping_for_public_apis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/ensure_access_to_call_settings_is_restricted_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/ensure_access_to_call_settings_is_restricted_flag_values.textproto
deleted file mode 100644
index ec349530..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/ensure_access_to_call_settings_is_restricted_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "ensure_access_to_call_settings_is_restricted"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/esim_available_memory_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/esim_available_memory_flag_values.textproto
deleted file mode 100644
index cd850a15..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/esim_available_memory_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "esim_available_memory"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/esim_bootstrap_provisioning_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/esim_bootstrap_provisioning_flag_flag_values.textproto
deleted file mode 100644
index 84c83a2e..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/esim_bootstrap_provisioning_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "esim_bootstrap_provisioning_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/fix_crash_on_getting_config_when_phone_is_gone_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/fix_crash_on_getting_config_when_phone_is_gone_flag_values.textproto
deleted file mode 100644
index 9e004db0..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/fix_crash_on_getting_config_when_phone_is_gone_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "fix_crash_on_getting_config_when_phone_is_gone"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/force_imsi_certificate_delete_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/force_imsi_certificate_delete_flag_values.textproto
deleted file mode 100644
index 5cfc9da7..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/force_imsi_certificate_delete_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "force_imsi_certificate_delete"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/force_iwlan_mms_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/force_iwlan_mms_flag_values.textproto
deleted file mode 100644
index 1052d0a9..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/force_iwlan_mms_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "force_iwlan_mms"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/geofence_enhancement_for_better_ux_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/geofence_enhancement_for_better_ux_flag_values.textproto
deleted file mode 100644
index 5d9436bb..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/geofence_enhancement_for_better_ux_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "geofence_enhancement_for_better_ux"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/get_group_id_level2_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/get_group_id_level2_flag_values.textproto
deleted file mode 100644
index 8470154c..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/get_group_id_level2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "get_group_id_level2"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/hangup_active_call_based_on_emergency_call_domain_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/hangup_active_call_based_on_emergency_call_domain_flag_values.textproto
deleted file mode 100644
index 1569ade0..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/hangup_active_call_based_on_emergency_call_domain_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "hangup_active_call_based_on_emergency_call_domain"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/hangup_emergency_call_for_cross_sim_redialing_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/hangup_emergency_call_for_cross_sim_redialing_flag_values.textproto
deleted file mode 100644
index b8647898..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/hangup_emergency_call_for_cross_sim_redialing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "hangup_emergency_call_for_cross_sim_redialing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/hide_prefer_3g_item_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/hide_prefer_3g_item_flag_values.textproto
deleted file mode 100644
index 3b36622f..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/hide_prefer_3g_item_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "hide_prefer_3g_item"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/hide_preinstalled_carrier_app_at_most_once_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/hide_preinstalled_carrier_app_at_most_once_flag_values.textproto
deleted file mode 100644
index a98707a1..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/hide_preinstalled_carrier_app_at_most_once_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "hide_preinstalled_carrier_app_at_most_once"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/hide_roaming_icon_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/hide_roaming_icon_flag_values.textproto
deleted file mode 100644
index b42cd01f..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/hide_roaming_icon_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "hide_roaming_icon"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/hsum_broadcast_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/hsum_broadcast_flag_values.textproto
deleted file mode 100644
index f29ad402..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/hsum_broadcast_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "hsum_broadcast"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/hsum_package_manager_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/hsum_package_manager_flag_values.textproto
deleted file mode 100644
index d46309ad..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/hsum_package_manager_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "hsum_package_manager"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/ignore_already_terminated_incoming_call_before_registering_listener_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/ignore_already_terminated_incoming_call_before_registering_listener_flag_values.textproto
deleted file mode 100644
index 7783fea6..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/ignore_already_terminated_incoming_call_before_registering_listener_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "ignore_already_terminated_incoming_call_before_registering_listener"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/ignore_carrierid_reset_for_sim_removal_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/ignore_carrierid_reset_for_sim_removal_flag_values.textproto
deleted file mode 100644
index d0405812..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/ignore_carrierid_reset_for_sim_removal_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "ignore_carrierid_reset_for_sim_removal"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/ignore_existing_networks_for_internet_allowed_checking_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/ignore_existing_networks_for_internet_allowed_checking_flag_values.textproto
deleted file mode 100644
index 83e71ae4..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/ignore_existing_networks_for_internet_allowed_checking_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "ignore_existing_networks_for_internet_allowed_checking"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/ignore_mcc_mnc_from_operator_for_locale_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/ignore_mcc_mnc_from_operator_for_locale_flag_values.textproto
deleted file mode 100644
index f7cc0cda..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/ignore_mcc_mnc_from_operator_for_locale_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "ignore_mcc_mnc_from_operator_for_locale"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/ims_resolver_user_aware_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/ims_resolver_user_aware_flag_values.textproto
deleted file mode 100644
index a959b135..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/ims_resolver_user_aware_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "ims_resolver_user_aware"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/imsi_key_retry_download_on_phone_unlock_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/imsi_key_retry_download_on_phone_unlock_flag_values.textproto
deleted file mode 100644
index e6600778..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/imsi_key_retry_download_on_phone_unlock_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "imsi_key_retry_download_on_phone_unlock"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/incall_handover_policy_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/incall_handover_policy_flag_values.textproto
deleted file mode 100644
index 760d0475..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/incall_handover_policy_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "incall_handover_policy"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/keep_empty_requests_network_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/keep_empty_requests_network_flag_values.textproto
deleted file mode 100644
index a98604d8..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/keep_empty_requests_network_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "keep_empty_requests_network"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/keep_ping_request_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/keep_ping_request_flag_values.textproto
deleted file mode 100644
index 568d2834..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/keep_ping_request_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "keep_ping_request"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/log_mms_sms_database_access_info_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/log_mms_sms_database_access_info_flag_values.textproto
deleted file mode 100644
index b4aa2f0c..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/log_mms_sms_database_access_info_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "log_mms_sms_database_access_info"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/metered_embb_urlcc_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/metered_embb_urlcc_flag_values.textproto
deleted file mode 100644
index 4e72ad6f..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/metered_embb_urlcc_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "metered_embb_urlcc"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/minimal_telephony_cdm_check_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/minimal_telephony_cdm_check_flag_values.textproto
deleted file mode 100644
index 35b6212a..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/minimal_telephony_cdm_check_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "minimal_telephony_cdm_check"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/minimal_telephony_managers_conditional_on_features_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/minimal_telephony_managers_conditional_on_features_flag_values.textproto
deleted file mode 100644
index 7a26350d..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/minimal_telephony_managers_conditional_on_features_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "minimal_telephony_managers_conditional_on_features"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/mms_disabled_error_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/mms_disabled_error_flag_values.textproto
deleted file mode 100644
index 96b45e3c..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/mms_disabled_error_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "mms_disabled_error"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/mms_get_apn_from_pdsc_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/mms_get_apn_from_pdsc_flag_values.textproto
deleted file mode 100644
index dae660c7..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/mms_get_apn_from_pdsc_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "mms_get_apn_from_pdsc"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/national_country_code_formatting_for_local_calls_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/national_country_code_formatting_for_local_calls_flag_values.textproto
deleted file mode 100644
index c6daf8c9..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/national_country_code_formatting_for_local_calls_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "national_country_code_formatting_for_local_calls"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/network_registration_info_reject_cause_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/network_registration_info_reject_cause_flag_values.textproto
deleted file mode 100644
index 84f7f8f9..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/network_registration_info_reject_cause_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "network_registration_info_reject_cause"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/network_validation_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/network_validation_flag_values.textproto
deleted file mode 100644
index 0c77f8d5..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/network_validation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "network_validation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/notify_data_activity_changed_with_slot_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/notify_data_activity_changed_with_slot_flag_values.textproto
deleted file mode 100644
index 519f8f75..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/notify_data_activity_changed_with_slot_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "notify_data_activity_changed_with_slot"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/notify_initial_ims_provisioning_status_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/notify_initial_ims_provisioning_status_flag_values.textproto
deleted file mode 100644
index c0e58a0f..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/notify_initial_ims_provisioning_status_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "notify_initial_ims_provisioning_status"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/oem_enabled_satellite_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/oem_enabled_satellite_flag_flag_values.textproto
deleted file mode 100644
index 4c10a7a6..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/oem_enabled_satellite_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "oem_enabled_satellite_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/oem_paid_private_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/oem_paid_private_flag_values.textproto
deleted file mode 100644
index 42a2d1c8..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/oem_paid_private_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "oem_paid_private"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/optimization_apdu_sender_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/optimization_apdu_sender_flag_values.textproto
deleted file mode 100644
index 1126a101..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/optimization_apdu_sender_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "optimization_apdu_sender"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/pass_copied_call_state_list_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/pass_copied_call_state_list_flag_values.textproto
deleted file mode 100644
index 7e488b4c..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/pass_copied_call_state_list_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "pass_copied_call_state_list"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/perform_cross_stack_redial_check_for_emergency_call_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/perform_cross_stack_redial_check_for_emergency_call_flag_values.textproto
deleted file mode 100644
index a6e975d1..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/perform_cross_stack_redial_check_for_emergency_call_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "perform_cross_stack_redial_check_for_emergency_call"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/phone_type_cleanup_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/phone_type_cleanup_flag_values.textproto
deleted file mode 100644
index f23c2cfe..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/phone_type_cleanup_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "phone_type_cleanup"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/prevent_hangup_during_call_merge_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/prevent_hangup_during_call_merge_flag_values.textproto
deleted file mode 100644
index c7a0cc49..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/prevent_hangup_during_call_merge_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "prevent_hangup_during_call_merge"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/prevent_invocation_repeat_of_ril_call_when_device_does_not_support_voice_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/prevent_invocation_repeat_of_ril_call_when_device_does_not_support_voice_flag_values.textproto
deleted file mode 100644
index 3c263639..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/prevent_invocation_repeat_of_ril_call_when_device_does_not_support_voice_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "prevent_invocation_repeat_of_ril_call_when_device_does_not_support_voice"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/prevent_system_server_and_phone_deadlock_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/prevent_system_server_and_phone_deadlock_flag_values.textproto
deleted file mode 100644
index c7ed3bf5..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/prevent_system_server_and_phone_deadlock_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "prevent_system_server_and_phone_deadlock"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/reconnect_qualified_network_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/reconnect_qualified_network_flag_values.textproto
deleted file mode 100644
index 58835a1d..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/reconnect_qualified_network_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "reconnect_qualified_network"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/refine_preferred_data_profile_selection_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/refine_preferred_data_profile_selection_flag_values.textproto
deleted file mode 100644
index d028cb62..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/refine_preferred_data_profile_selection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "refine_preferred_data_profile_selection"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/relax_ho_teardown_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/relax_ho_teardown_flag_values.textproto
deleted file mode 100644
index 5405abe8..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/relax_ho_teardown_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "relax_ho_teardown"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/remap_disconnect_cause_sip_request_cancelled_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/remap_disconnect_cause_sip_request_cancelled_flag_values.textproto
deleted file mode 100644
index 8bde7c78..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/remap_disconnect_cause_sip_request_cancelled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "remap_disconnect_cause_sip_request_cancelled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/remove_country_code_from_local_singapore_calls_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/remove_country_code_from_local_singapore_calls_flag_values.textproto
deleted file mode 100644
index 731e72e6..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/remove_country_code_from_local_singapore_calls_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "remove_country_code_from_local_singapore_calls"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/reorganize_roaming_notification_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/reorganize_roaming_notification_flag_values.textproto
deleted file mode 100644
index 92e6b2f8..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/reorganize_roaming_notification_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "reorganize_roaming_notification"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/reset_mobile_network_settings_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/reset_mobile_network_settings_flag_values.textproto
deleted file mode 100644
index 475b2545..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/reset_mobile_network_settings_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "reset_mobile_network_settings"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/reset_primary_sim_default_values_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/reset_primary_sim_default_values_flag_values.textproto
deleted file mode 100644
index b94fc854..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/reset_primary_sim_default_values_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "reset_primary_sim_default_values"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/roaming_notification_for_single_data_network_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/roaming_notification_for_single_data_network_flag_values.textproto
deleted file mode 100644
index 63b7b46d..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/roaming_notification_for_single_data_network_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "roaming_notification_for_single_data_network"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/robust_number_verification_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/robust_number_verification_flag_values.textproto
deleted file mode 100644
index da405899..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/robust_number_verification_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "robust_number_verification"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/safer_get_phone_number_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/safer_get_phone_number_flag_values.textproto
deleted file mode 100644
index 6dfc7eb6..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/safer_get_phone_number_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "safer_get_phone_number"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/satellite_25q4_apis_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/satellite_25q4_apis_flag_values.textproto
deleted file mode 100644
index 73b4fce0..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/satellite_25q4_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "satellite_25q4_apis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/satellite_exit_p2p_session_outside_geofence_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/satellite_exit_p2p_session_outside_geofence_flag_values.textproto
deleted file mode 100644
index 9915f183..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/satellite_exit_p2p_session_outside_geofence_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "satellite_exit_p2p_session_outside_geofence"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/satellite_internet_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/satellite_internet_flag_values.textproto
deleted file mode 100644
index 0d4150d8..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/satellite_internet_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "satellite_internet"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/satellite_state_change_listener_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/satellite_state_change_listener_flag_values.textproto
deleted file mode 100644
index 76ee4fff..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/satellite_state_change_listener_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "satellite_state_change_listener"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/satellite_system_apis_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/satellite_system_apis_flag_values.textproto
deleted file mode 100644
index 43906761..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/satellite_system_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "satellite_system_apis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/security_algorithms_update_indications_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/security_algorithms_update_indications_flag_values.textproto
deleted file mode 100644
index b4976785..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/security_algorithms_update_indications_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "security_algorithms_update_indications"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/set_carrier_restriction_status_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/set_carrier_restriction_status_flag_values.textproto
deleted file mode 100644
index 583f085b..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/set_carrier_restriction_status_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "set_carrier_restriction_status"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/set_no_reply_timer_for_cfnry_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/set_no_reply_timer_for_cfnry_flag_values.textproto
deleted file mode 100644
index 9401af57..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/set_no_reply_timer_for_cfnry_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "set_no_reply_timer_for_cfnry"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/set_number_of_sim_for_ims_enable_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/set_number_of_sim_for_ims_enable_flag_values.textproto
deleted file mode 100644
index 0baf5d6a..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/set_number_of_sim_for_ims_enable_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "set_number_of_sim_for_ims_enable"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/show_call_fail_notification_for_2g_toggle_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/show_call_fail_notification_for_2g_toggle_flag_values.textproto
deleted file mode 100644
index d784e108..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/show_call_fail_notification_for_2g_toggle_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "show_call_fail_notification_for_2g_toggle"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/show_call_id_and_call_waiting_in_additional_settings_menu_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/show_call_id_and_call_waiting_in_additional_settings_menu_flag_values.textproto
deleted file mode 100644
index d2093d5e..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/show_call_id_and_call_waiting_in_additional_settings_menu_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "show_call_id_and_call_waiting_in_additional_settings_menu"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/sim_disabled_graceful_tear_down_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/sim_disabled_graceful_tear_down_flag_values.textproto
deleted file mode 100644
index 3306d811..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/sim_disabled_graceful_tear_down_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "sim_disabled_graceful_tear_down"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/simultaneous_calling_indications_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/simultaneous_calling_indications_flag_values.textproto
deleted file mode 100644
index 9474b180..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/simultaneous_calling_indications_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "simultaneous_calling_indications"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/skip_mmi_code_check_for_emergency_call_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/skip_mmi_code_check_for_emergency_call_flag_values.textproto
deleted file mode 100644
index 42d009b9..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/skip_mmi_code_check_for_emergency_call_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "skip_mmi_code_check_for_emergency_call"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/slicing_additional_error_codes_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/slicing_additional_error_codes_flag_values.textproto
deleted file mode 100644
index 0ca8421e..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/slicing_additional_error_codes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "slicing_additional_error_codes"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/sms_domain_selection_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/sms_domain_selection_enabled_flag_values.textproto
deleted file mode 100644
index a455d9bc..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/sms_domain_selection_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "sms_domain_selection_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/sms_mms_deliver_broadcasts_redirect_to_main_user_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/sms_mms_deliver_broadcasts_redirect_to_main_user_flag_values.textproto
deleted file mode 100644
index 8db79fb4..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/sms_mms_deliver_broadcasts_redirect_to_main_user_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "sms_mms_deliver_broadcasts_redirect_to_main_user"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/starlink_data_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/starlink_data_bugfix_flag_values.textproto
deleted file mode 100644
index 713013a0..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/starlink_data_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "starlink_data_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/stop_spamming_emergency_notification_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/stop_spamming_emergency_notification_flag_values.textproto
deleted file mode 100644
index d564c482..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/stop_spamming_emergency_notification_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "stop_spamming_emergency_notification"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/subscription_plan_allow_status_and_end_date_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/subscription_plan_allow_status_and_end_date_flag_values.textproto
deleted file mode 100644
index b1d0e4c5..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/subscription_plan_allow_status_and_end_date_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "subscription_plan_allow_status_and_end_date"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/subscription_user_association_query_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/subscription_user_association_query_flag_values.textproto
deleted file mode 100644
index b476eaa8..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/subscription_user_association_query_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "subscription_user_association_query"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/support_carrier_services_for_hsum_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/support_carrier_services_for_hsum_flag_values.textproto
deleted file mode 100644
index e1c53e2e..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/support_carrier_services_for_hsum_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "support_carrier_services_for_hsum"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/support_ims_mmtel_interface_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/support_ims_mmtel_interface_flag_values.textproto
deleted file mode 100644
index 938c4ef3..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/support_ims_mmtel_interface_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "support_ims_mmtel_interface"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/support_isim_record_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/support_isim_record_flag_values.textproto
deleted file mode 100644
index 59aa6af9..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/support_isim_record_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "support_isim_record"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/support_network_provider_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/support_network_provider_flag_values.textproto
deleted file mode 100644
index 3074ba9a..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/support_network_provider_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "support_network_provider"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/support_nr_sa_rrc_idle_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/support_nr_sa_rrc_idle_flag_values.textproto
deleted file mode 100644
index 56643f46..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/support_nr_sa_rrc_idle_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "support_nr_sa_rrc_idle"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/support_phone_uid_check_for_multiuser_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/support_phone_uid_check_for_multiuser_flag_values.textproto
deleted file mode 100644
index 40dbd981..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/support_phone_uid_check_for_multiuser_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "support_phone_uid_check_for_multiuser"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/support_psim_to_esim_conversion_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/support_psim_to_esim_conversion_flag_values.textproto
deleted file mode 100644
index 4ab0536e..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/support_psim_to_esim_conversion_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "support_psim_to_esim_conversion"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/support_sms_over_ims_apis_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/support_sms_over_ims_apis_flag_values.textproto
deleted file mode 100644
index 0516c9fd..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/support_sms_over_ims_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "support_sms_over_ims_apis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/temporary_failures_in_carrier_messaging_service_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/temporary_failures_in_carrier_messaging_service_flag_values.textproto
deleted file mode 100644
index 041e57d8..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/temporary_failures_in_carrier_messaging_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "temporary_failures_in_carrier_messaging_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/terminate_active_video_call_when_accepting_second_video_call_as_audio_only_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/terminate_active_video_call_when_accepting_second_video_call_as_audio_only_flag_values.textproto
deleted file mode 100644
index 5f44afa0..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/terminate_active_video_call_when_accepting_second_video_call_as_audio_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "terminate_active_video_call_when_accepting_second_video_call_as_audio_only"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/uicc_app_count_check_to_create_channel_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/uicc_app_count_check_to_create_channel_flag_values.textproto
deleted file mode 100644
index b9d2798b..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/uicc_app_count_check_to_create_channel_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "uicc_app_count_check_to_create_channel"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/uicc_phone_number_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/uicc_phone_number_fix_flag_values.textproto
deleted file mode 100644
index 63c227fc..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/uicc_phone_number_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "uicc_phone_number_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/unregister_sms_broadcast_receiver_from_cat_service_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/unregister_sms_broadcast_receiver_from_cat_service_flag_values.textproto
deleted file mode 100644
index a2615e99..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/unregister_sms_broadcast_receiver_from_cat_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "unregister_sms_broadcast_receiver_from_cat_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/unthrottle_check_transport_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/unthrottle_check_transport_flag_values.textproto
deleted file mode 100644
index 89b5b67f..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/unthrottle_check_transport_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "unthrottle_check_transport"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/update_ims_service_by_gathering_provisioning_changes_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/update_ims_service_by_gathering_provisioning_changes_flag_values.textproto
deleted file mode 100644
index 9ba25b91..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/update_ims_service_by_gathering_provisioning_changes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "update_ims_service_by_gathering_provisioning_changes"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/update_roaming_state_to_set_wfc_mode_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/update_roaming_state_to_set_wfc_mode_flag_values.textproto
deleted file mode 100644
index c379f273..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/update_roaming_state_to_set_wfc_mode_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "update_roaming_state_to_set_wfc_mode"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/use_alarm_callback_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/use_alarm_callback_flag_values.textproto
deleted file mode 100644
index a8c51ced..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/use_alarm_callback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "use_alarm_callback"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/use_carrier_config_for_cfnry_time_via_mmi_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/use_carrier_config_for_cfnry_time_via_mmi_flag_values.textproto
deleted file mode 100644
index e720c8e0..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/use_carrier_config_for_cfnry_time_via_mmi_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "use_carrier_config_for_cfnry_time_via_mmi"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/use_i18n_for_mcc_mapping_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/use_i18n_for_mcc_mapping_flag_values.textproto
deleted file mode 100644
index bfa574df..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/use_i18n_for_mcc_mapping_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "use_i18n_for_mcc_mapping"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/use_oem_domain_selection_service_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/use_oem_domain_selection_service_flag_values.textproto
deleted file mode 100644
index d179f0a4..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/use_oem_domain_selection_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "use_oem_domain_selection_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/use_relaxed_id_match_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/use_relaxed_id_match_flag_values.textproto
deleted file mode 100644
index 859f8739..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/use_relaxed_id_match_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "use_relaxed_id_match"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/vonr_enabled_metric_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/vonr_enabled_metric_flag_values.textproto
deleted file mode 100644
index e0e92c87..00000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/vonr_enabled_metric_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "vonr_enabled_metric"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.ipsec.flags/Android.bp b/aconfig/trunk_staging/com.android.ipsec.flags/Android.bp
deleted file mode 100644
index 217dd3a8..00000000
--- a/aconfig/trunk_staging/com.android.ipsec.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.ipsec.flags-all",
-  package: "com.android.ipsec.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.ipsec.flags/dpd_disable_api_flag_values.textproto b/aconfig/trunk_staging/com.android.ipsec.flags/dpd_disable_api_flag_values.textproto
deleted file mode 100644
index f6df9299..00000000
--- a/aconfig/trunk_staging/com.android.ipsec.flags/dpd_disable_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.ipsec.flags"
-  name: "dpd_disable_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.ipsec.flags/dumpsys_api_flag_values.textproto b/aconfig/trunk_staging/com.android.ipsec.flags/dumpsys_api_flag_values.textproto
deleted file mode 100644
index 76ded677..00000000
--- a/aconfig/trunk_staging/com.android.ipsec.flags/dumpsys_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.ipsec.flags"
-  name: "dumpsys_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.ipsec.flags/enabled_ike_options_api_flag_values.textproto b/aconfig/trunk_staging/com.android.ipsec.flags/enabled_ike_options_api_flag_values.textproto
deleted file mode 100644
index 50bb432c..00000000
--- a/aconfig/trunk_staging/com.android.ipsec.flags/enabled_ike_options_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.ipsec.flags"
-  name: "enabled_ike_options_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/Android.bp b/aconfig/trunk_staging/com.android.launcher3/Android.bp
deleted file mode 100644
index aeec218f..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.launcher3-all",
-    package: "com.android.launcher3",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/accessibility_scroll_on_allapps_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/accessibility_scroll_on_allapps_flag_values.textproto
deleted file mode 100644
index a843cd2d..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/accessibility_scroll_on_allapps_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "accessibility_scroll_on_allapps"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/all_apps_sheet_for_handheld_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/all_apps_sheet_for_handheld_flag_values.textproto
deleted file mode 100644
index d2f68c05..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/all_apps_sheet_for_handheld_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "all_apps_sheet_for_handheld"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/coordinate_workspace_scale_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/coordinate_workspace_scale_flag_values.textproto
deleted file mode 100644
index f5d638f5..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/coordinate_workspace_scale_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "coordinate_workspace_scale"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_active_gesture_proto_log_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_active_gesture_proto_log_flag_values.textproto
deleted file mode 100644
index 04359868..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_active_gesture_proto_log_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_active_gesture_proto_log"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_add_app_widget_via_config_activity_v2_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_add_app_widget_via_config_activity_v2_flag_values.textproto
deleted file mode 100644
index bb20fb2a..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_add_app_widget_via_config_activity_v2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_add_app_widget_via_config_activity_v2"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_additional_home_animations_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_additional_home_animations_flag_values.textproto
deleted file mode 100644
index b02f12a3..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_additional_home_animations_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_additional_home_animations"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_alt_tab_kqs_on_connected_displays_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_alt_tab_kqs_on_connected_displays_flag_values.textproto
deleted file mode 100644
index ea76837f..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_alt_tab_kqs_on_connected_displays_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_alt_tab_kqs_on_connected_displays"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_categorized_widget_suggestions_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_categorized_widget_suggestions_flag_values.textproto
deleted file mode 100644
index 9a28da54..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_categorized_widget_suggestions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_categorized_widget_suggestions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_container_return_animations_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_container_return_animations_flag_values.textproto
deleted file mode 100644
index b7a58fa0..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_container_return_animations_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_container_return_animations"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_contrast_tiles_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_contrast_tiles_flag_values.textproto
deleted file mode 100644
index 23c76554..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_contrast_tiles_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_contrast_tiles"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_cursor_hover_states_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_cursor_hover_states_flag_values.textproto
deleted file mode 100644
index 426a32e8..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_cursor_hover_states_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_cursor_hover_states"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_desktop_task_alpha_animation_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_desktop_task_alpha_animation_flag_values.textproto
deleted file mode 100644
index b24414fc..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_desktop_task_alpha_animation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_desktop_task_alpha_animation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_dismiss_prediction_undo_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_dismiss_prediction_undo_flag_values.textproto
deleted file mode 100644
index 04e86dd1..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_dismiss_prediction_undo_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_dismiss_prediction_undo"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_expanding_pause_work_button_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_expanding_pause_work_button_flag_values.textproto
deleted file mode 100644
index bda349e9..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_expanding_pause_work_button_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_expanding_pause_work_button"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_expressive_dismiss_task_motion_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_expressive_dismiss_task_motion_flag_values.textproto
deleted file mode 100644
index f5ba550c..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_expressive_dismiss_task_motion_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_expressive_dismiss_task_motion"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_first_screen_broadcast_archiving_extras_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_first_screen_broadcast_archiving_extras_flag_values.textproto
deleted file mode 100644
index e894849e..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_first_screen_broadcast_archiving_extras_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_first_screen_broadcast_archiving_extras"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_focus_outline_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_focus_outline_flag_values.textproto
deleted file mode 100644
index 8e511de0..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_focus_outline_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_focus_outline"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_generated_previews_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_generated_previews_flag_values.textproto
deleted file mode 100644
index 7815400d..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_generated_previews_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_generated_previews"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_gesture_nav_horizontal_touch_slop_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_gesture_nav_horizontal_touch_slop_flag_values.textproto
deleted file mode 100644
index 977a8ef6..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_gesture_nav_horizontal_touch_slop_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_gesture_nav_horizontal_touch_slop"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_gesture_nav_on_connected_displays_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_gesture_nav_on_connected_displays_flag_values.textproto
deleted file mode 100644
index 3bd95509..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_gesture_nav_on_connected_displays_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_gesture_nav_on_connected_displays"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_grid_migration_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_grid_migration_fix_flag_values.textproto
deleted file mode 100644
index 24dc8ff0..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_grid_migration_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_grid_migration_fix"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_grid_only_overview_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_grid_only_overview_flag_values.textproto
deleted file mode 100644
index eea48eee..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_grid_only_overview_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_grid_only_overview"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_handle_delayed_gesture_callbacks_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_handle_delayed_gesture_callbacks_flag_values.textproto
deleted file mode 100644
index b84d2959..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_handle_delayed_gesture_callbacks_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_handle_delayed_gesture_callbacks"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_home_transition_listener_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_home_transition_listener_flag_values.textproto
deleted file mode 100644
index 99780e8e..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_home_transition_listener_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_home_transition_listener"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_hover_of_child_elements_in_taskview_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_hover_of_child_elements_in_taskview_flag_values.textproto
deleted file mode 100644
index 89e43285..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_hover_of_child_elements_in_taskview_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_hover_of_child_elements_in_taskview"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_large_desktop_windowing_tile_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_large_desktop_windowing_tile_flag_values.textproto
deleted file mode 100644
index 4de02f56..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_large_desktop_windowing_tile_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_large_desktop_windowing_tile"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_launcher_br_metrics_fixed_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_launcher_br_metrics_fixed_flag_values.textproto
deleted file mode 100644
index bff0bc6a..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_launcher_br_metrics_fixed_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_launcher_br_metrics_fixed"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_launcher_icon_shapes_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_launcher_icon_shapes_flag_values.textproto
deleted file mode 100644
index 9b4c117b..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_launcher_icon_shapes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_launcher_icon_shapes"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_launcher_visual_refresh_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_launcher_visual_refresh_flag_values.textproto
deleted file mode 100644
index 8b6c284d..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_launcher_visual_refresh_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_launcher_visual_refresh"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_multi_instance_menu_taskbar_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_multi_instance_menu_taskbar_flag_values.textproto
deleted file mode 100644
index 5b8e3536..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_multi_instance_menu_taskbar_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_multi_instance_menu_taskbar"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_narrow_grid_restore_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_narrow_grid_restore_flag_values.textproto
deleted file mode 100644
index 72126b59..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_narrow_grid_restore_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_narrow_grid_restore"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_overview_background_wallpaper_blur_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_overview_background_wallpaper_blur_flag_values.textproto
deleted file mode 100644
index 5e18595f..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_overview_background_wallpaper_blur_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_overview_background_wallpaper_blur"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_overview_command_helper_timeout_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_overview_command_helper_timeout_flag_values.textproto
deleted file mode 100644
index 897cca20..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_overview_command_helper_timeout_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_overview_command_helper_timeout"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_overview_icon_menu_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_overview_icon_menu_flag_values.textproto
deleted file mode 100644
index 61df9e2b..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_overview_icon_menu_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_overview_icon_menu"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_predictive_back_gesture_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_predictive_back_gesture_flag_values.textproto
deleted file mode 100644
index 11ea3fb0..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_predictive_back_gesture_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_predictive_back_gesture"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_private_space_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_private_space_flag_values.textproto
deleted file mode 100644
index f410117b..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_private_space_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_private_space"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_private_space_install_shortcut_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_private_space_install_shortcut_flag_values.textproto
deleted file mode 100644
index 530e9097..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_private_space_install_shortcut_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_private_space_install_shortcut"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_refactor_task_thumbnail_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_refactor_task_thumbnail_flag_values.textproto
deleted file mode 100644
index d90d1d1b..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_refactor_task_thumbnail_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_refactor_task_thumbnail"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_responsive_workspace_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_responsive_workspace_flag_values.textproto
deleted file mode 100644
index 4bae58e2..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_responsive_workspace_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_responsive_workspace"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_scaling_reveal_home_animation_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_scaling_reveal_home_animation_flag_values.textproto
deleted file mode 100644
index 7c9d0a58..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_scaling_reveal_home_animation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_scaling_reveal_home_animation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_separate_external_display_tasks_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_separate_external_display_tasks_flag_values.textproto
deleted file mode 100644
index e61e58ca..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_separate_external_display_tasks_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_separate_external_display_tasks"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_shortcut_dont_suggest_app_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_shortcut_dont_suggest_app_flag_values.textproto
deleted file mode 100644
index b1ffe830..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_shortcut_dont_suggest_app_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_shortcut_dont_suggest_app"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_show_enabled_shortcuts_in_accessibility_menu_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_show_enabled_shortcuts_in_accessibility_menu_flag_values.textproto
deleted file mode 100644
index 73b3ad6e..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_show_enabled_shortcuts_in_accessibility_menu_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_show_enabled_shortcuts_in_accessibility_menu"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_support_for_archiving_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_support_for_archiving_flag_values.textproto
deleted file mode 100644
index 8717a6ff..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_support_for_archiving_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_support_for_archiving"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_taskbar_pinning_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_taskbar_pinning_flag_values.textproto
deleted file mode 100644
index d166657e..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_taskbar_pinning_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_taskbar_pinning"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_twoline_toggle_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_twoline_toggle_flag_values.textproto
deleted file mode 100644
index 289437cd..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_twoline_toggle_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_twoline_toggle"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_unfolded_two_pane_picker_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_unfolded_two_pane_picker_flag_values.textproto
deleted file mode 100644
index 6ef99df4..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_unfolded_two_pane_picker_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_unfolded_two_pane_picker"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_use_top_visible_activity_for_exclude_from_recent_task_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_use_top_visible_activity_for_exclude_from_recent_task_flag_values.textproto
deleted file mode 100644
index 033f05bd..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_use_top_visible_activity_for_exclude_from_recent_task_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_use_top_visible_activity_for_exclude_from_recent_task"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_widget_tap_to_add_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_widget_tap_to_add_flag_values.textproto
deleted file mode 100644
index 80b2c404..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_widget_tap_to_add_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_widget_tap_to_add"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_workspace_inflation_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_workspace_inflation_flag_values.textproto
deleted file mode 100644
index 1a19b7ab..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/enable_workspace_inflation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "enable_workspace_inflation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/expressive_theme_in_taskbar_and_navigation_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/expressive_theme_in_taskbar_and_navigation_flag_values.textproto
deleted file mode 100644
index f45e2149..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/expressive_theme_in_taskbar_and_navigation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "expressive_theme_in_taskbar_and_navigation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/force_monochrome_app_icons_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/force_monochrome_app_icons_flag_values.textproto
deleted file mode 100644
index bb721323..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/force_monochrome_app_icons_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "force_monochrome_app_icons"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/grid_migration_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/grid_migration_refactor_flag_values.textproto
deleted file mode 100644
index 234f0767..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/grid_migration_refactor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "grid_migration_refactor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/ignore_three_finger_trackpad_for_nav_handle_long_press_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/ignore_three_finger_trackpad_for_nav_handle_long_press_flag_values.textproto
deleted file mode 100644
index 0cc9c1fd..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/ignore_three_finger_trackpad_for_nav_handle_long_press_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "ignore_three_finger_trackpad_for_nav_handle_long_press"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/msdl_feedback_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/msdl_feedback_flag_values.textproto
deleted file mode 100644
index 42cb1e08..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/msdl_feedback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "msdl_feedback"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/multiline_search_bar_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/multiline_search_bar_flag_values.textproto
deleted file mode 100644
index ae9566e7..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/multiline_search_bar_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "multiline_search_bar"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/navigate_to_child_preference_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/navigate_to_child_preference_flag_values.textproto
deleted file mode 100644
index bc1f030c..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/navigate_to_child_preference_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "navigate_to_child_preference"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/one_grid_specs_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/one_grid_specs_flag_values.textproto
deleted file mode 100644
index a7f41bfc..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/one_grid_specs_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "one_grid_specs"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/predictive_back_to_home_blur_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/predictive_back_to_home_blur_flag_values.textproto
deleted file mode 100644
index 64c836d4..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/predictive_back_to_home_blur_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "predictive_back_to_home_blur"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/predictive_back_to_home_polish_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/predictive_back_to_home_polish_flag_values.textproto
deleted file mode 100644
index d9a7c121..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/predictive_back_to_home_polish_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "predictive_back_to_home_polish"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/private_space_add_floating_mask_view_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/private_space_add_floating_mask_view_flag_values.textproto
deleted file mode 100644
index e995c991..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/private_space_add_floating_mask_view_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "private_space_add_floating_mask_view"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/private_space_animation_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/private_space_animation_flag_values.textproto
deleted file mode 100644
index 73574b29..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/private_space_animation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "private_space_animation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/private_space_app_installer_button_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/private_space_app_installer_button_flag_values.textproto
deleted file mode 100644
index e3ed9833..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/private_space_app_installer_button_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "private_space_app_installer_button"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/private_space_restrict_accessibility_drag_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/private_space_restrict_accessibility_drag_flag_values.textproto
deleted file mode 100644
index 8059152a..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/private_space_restrict_accessibility_drag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "private_space_restrict_accessibility_drag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/private_space_restrict_item_drag_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/private_space_restrict_item_drag_flag_values.textproto
deleted file mode 100644
index 669f93f5..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/private_space_restrict_item_drag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "private_space_restrict_item_drag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/private_space_sys_apps_separation_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/private_space_sys_apps_separation_flag_values.textproto
deleted file mode 100644
index 775113db..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/private_space_sys_apps_separation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "private_space_sys_apps_separation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/remove_apps_refresh_on_right_click_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/remove_apps_refresh_on_right_click_flag_values.textproto
deleted file mode 100644
index d9250934..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/remove_apps_refresh_on_right_click_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "remove_apps_refresh_on_right_click"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/remove_exclude_from_screen_magnification_flag_usage_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/remove_exclude_from_screen_magnification_flag_usage_flag_values.textproto
deleted file mode 100644
index 59314c1f..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/remove_exclude_from_screen_magnification_flag_usage_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "remove_exclude_from_screen_magnification_flag_usage"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/restore_archived_app_icons_from_db_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/restore_archived_app_icons_from_db_flag_values.textproto
deleted file mode 100644
index db4162d8..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/restore_archived_app_icons_from_db_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "restore_archived_app_icons_from_db"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/restore_archived_shortcuts_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/restore_archived_shortcuts_flag_values.textproto
deleted file mode 100644
index 1f971e6a..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/restore_archived_shortcuts_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "restore_archived_shortcuts"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/show_taskbar_pinning_popup_from_anywhere_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/show_taskbar_pinning_popup_from_anywhere_flag_values.textproto
deleted file mode 100644
index 9d6694e2..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/show_taskbar_pinning_popup_from_anywhere_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "show_taskbar_pinning_popup_from_anywhere"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/sync_app_launch_with_taskbar_stash_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/sync_app_launch_with_taskbar_stash_flag_values.textproto
deleted file mode 100644
index 0309784e..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/sync_app_launch_with_taskbar_stash_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "sync_app_launch_with_taskbar_stash"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/taskbar_overflow_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/taskbar_overflow_flag_values.textproto
deleted file mode 100644
index a78ecd69..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/taskbar_overflow_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "taskbar_overflow"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/use_activity_overlay_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/use_activity_overlay_flag_values.textproto
deleted file mode 100644
index 9b4c44ea..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/use_activity_overlay_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "use_activity_overlay"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/use_new_icon_for_archived_apps_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/use_new_icon_for_archived_apps_flag_values.textproto
deleted file mode 100644
index 6ddc5ad8..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/use_new_icon_for_archived_apps_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "use_new_icon_for_archived_apps"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/use_system_radius_for_app_widgets_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/use_system_radius_for_app_widgets_flag_values.textproto
deleted file mode 100644
index b78e36cc..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/use_system_radius_for_app_widgets_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "use_system_radius_for_app_widgets"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.launcher3/work_scheduler_in_work_profile_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/work_scheduler_in_work_profile_flag_values.textproto
deleted file mode 100644
index da700289..00000000
--- a/aconfig/trunk_staging/com.android.launcher3/work_scheduler_in_work_profile_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.launcher3"
-  name: "work_scheduler_in_work_profile"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.libcore.readonly/Android.bp b/aconfig/trunk_staging/com.android.libcore.readonly/Android.bp
deleted file mode 100644
index adc4eb76..00000000
--- a/aconfig/trunk_staging/com.android.libcore.readonly/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.libcore.readonly-all",
-    package: "com.android.libcore.readonly",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.libcore.readonly/native_metrics_flag_values.textproto b/aconfig/trunk_staging/com.android.libcore.readonly/native_metrics_flag_values.textproto
deleted file mode 100644
index 63ed2579..00000000
--- a/aconfig/trunk_staging/com.android.libcore.readonly/native_metrics_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.libcore.readonly"
-  name: "native_metrics"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.libcore.readonly/post_cleanup_apis_flag_values.textproto b/aconfig/trunk_staging/com.android.libcore.readonly/post_cleanup_apis_flag_values.textproto
deleted file mode 100644
index e4dc69a9..00000000
--- a/aconfig/trunk_staging/com.android.libcore.readonly/post_cleanup_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.libcore.readonly"
-  name: "post_cleanup_apis"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.libcore/Android.bp b/aconfig/trunk_staging/com.android.libcore/Android.bp
deleted file mode 100644
index 333d91e7..00000000
--- a/aconfig/trunk_staging/com.android.libcore/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.libcore-all",
-    package: "com.android.libcore",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.libcore/appinfo_flag_values.textproto b/aconfig/trunk_staging/com.android.libcore/appinfo_flag_values.textproto
deleted file mode 100644
index 42a5cb93..00000000
--- a/aconfig/trunk_staging/com.android.libcore/appinfo_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.libcore"
-  name: "appinfo"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.libcore/hpke_public_api_flag_values.textproto b/aconfig/trunk_staging/com.android.libcore/hpke_public_api_flag_values.textproto
deleted file mode 100644
index 8c07db06..00000000
--- a/aconfig/trunk_staging/com.android.libcore/hpke_public_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.libcore"
-  name: "hpke_public_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.libcore/hpke_v_apis_flag_values.textproto b/aconfig/trunk_staging/com.android.libcore/hpke_v_apis_flag_values.textproto
deleted file mode 100644
index 7ca5122b..00000000
--- a/aconfig/trunk_staging/com.android.libcore/hpke_v_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.libcore"
-  name: "hpke_v_apis"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.libcore/madvise_api_flag_values.textproto b/aconfig/trunk_staging/com.android.libcore/madvise_api_flag_values.textproto
deleted file mode 100644
index 9827f74d..00000000
--- a/aconfig/trunk_staging/com.android.libcore/madvise_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.libcore"
-  name: "madvise_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.libcore/native_metrics_flag_values.textproto b/aconfig/trunk_staging/com.android.libcore/native_metrics_flag_values.textproto
deleted file mode 100644
index 4efd36ed..00000000
--- a/aconfig/trunk_staging/com.android.libcore/native_metrics_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.libcore"
-  name: "native_metrics"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.libcore/openjdk21_stringconcat_flag_values.textproto b/aconfig/trunk_staging/com.android.libcore/openjdk21_stringconcat_flag_values.textproto
deleted file mode 100644
index 15e129ce..00000000
--- a/aconfig/trunk_staging/com.android.libcore/openjdk21_stringconcat_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.libcore"
-  name: "openjdk21_stringconcat"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.libcore/openjdk_21_v1_apis_flag_values.textproto b/aconfig/trunk_staging/com.android.libcore/openjdk_21_v1_apis_flag_values.textproto
deleted file mode 100644
index c62b902d..00000000
--- a/aconfig/trunk_staging/com.android.libcore/openjdk_21_v1_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.libcore"
-  name: "openjdk_21_v1_apis"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.libcore/post_cleanup_apis_flag_values.textproto b/aconfig/trunk_staging/com.android.libcore/post_cleanup_apis_flag_values.textproto
deleted file mode 100644
index 18393a74..00000000
--- a/aconfig/trunk_staging/com.android.libcore/post_cleanup_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.libcore"
-  name: "post_cleanup_apis"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.libcore/read_only_dynamic_code_load_flag_values.textproto b/aconfig/trunk_staging/com.android.libcore/read_only_dynamic_code_load_flag_values.textproto
deleted file mode 100644
index dfd5d0c8..00000000
--- a/aconfig/trunk_staging/com.android.libcore/read_only_dynamic_code_load_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.libcore"
-  name: "read_only_dynamic_code_load"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.libcore/schedule_at_fixed_rate_new_behavior_flag_values.textproto b/aconfig/trunk_staging/com.android.libcore/schedule_at_fixed_rate_new_behavior_flag_values.textproto
deleted file mode 100644
index b6670d54..00000000
--- a/aconfig/trunk_staging/com.android.libcore/schedule_at_fixed_rate_new_behavior_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.libcore"
-  name: "schedule_at_fixed_rate_new_behavior"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.libcore/v_apis_flag_values.textproto b/aconfig/trunk_staging/com.android.libcore/v_apis_flag_values.textproto
deleted file mode 100644
index 3d1363e8..00000000
--- a/aconfig/trunk_staging/com.android.libcore/v_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.libcore"
-  name: "v_apis"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.libhardware.dynamic.sensors.flags/Android.bp b/aconfig/trunk_staging/com.android.libhardware.dynamic.sensors.flags/Android.bp
deleted file mode 100644
index 0a4a23ee..00000000
--- a/aconfig/trunk_staging/com.android.libhardware.dynamic.sensors.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.libhardware.dynamic.sensors.flags-all",
-  package: "com.android.libhardware.dynamic.sensors.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.libhardware.dynamic.sensors.flags/dynamic_sensors_hal_disconnect_dynamic_sensor_flag_values.textproto b/aconfig/trunk_staging/com.android.libhardware.dynamic.sensors.flags/dynamic_sensors_hal_disconnect_dynamic_sensor_flag_values.textproto
deleted file mode 100644
index 1ae5d1c6..00000000
--- a/aconfig/trunk_staging/com.android.libhardware.dynamic.sensors.flags/dynamic_sensors_hal_disconnect_dynamic_sensor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.libhardware.dynamic.sensors.flags"
-  name: "dynamic_sensors_hal_disconnect_dynamic_sensor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.libhardware.dynamic.sensors.flags/dynamic_sensors_le_audio_flag_values.textproto b/aconfig/trunk_staging/com.android.libhardware.dynamic.sensors.flags/dynamic_sensors_le_audio_flag_values.textproto
deleted file mode 100644
index c62e6598..00000000
--- a/aconfig/trunk_staging/com.android.libhardware.dynamic.sensors.flags/dynamic_sensors_le_audio_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.libhardware.dynamic.sensors.flags"
-  name: "dynamic_sensors_le_audio"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.managedprovisioning.flags/Android.bp b/aconfig/trunk_staging/com.android.managedprovisioning.flags/Android.bp
deleted file mode 100644
index 2186e50b..00000000
--- a/aconfig/trunk_staging/com.android.managedprovisioning.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.managedprovisioning.flags-all",
-    package: "com.android.managedprovisioning.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.managedprovisioning.flags/bad_state_v3_early_rh_download_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.managedprovisioning.flags/bad_state_v3_early_rh_download_enabled_flag_values.textproto
deleted file mode 100644
index 122629ee..00000000
--- a/aconfig/trunk_staging/com.android.managedprovisioning.flags/bad_state_v3_early_rh_download_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.managedprovisioning.flags"
-  name: "bad_state_v3_early_rh_download_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.managedprovisioning.flags/stop_disruptive_announcement_education_flag_values.textproto b/aconfig/trunk_staging/com.android.managedprovisioning.flags/stop_disruptive_announcement_education_flag_values.textproto
deleted file mode 100644
index efa819ee..00000000
--- a/aconfig/trunk_staging/com.android.managedprovisioning.flags/stop_disruptive_announcement_education_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.managedprovisioning.flags"
-  name: "stop_disruptive_announcement_education"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.managedprovisioning.flags/terms_view_accessibility_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.managedprovisioning.flags/terms_view_accessibility_enabled_flag_values.textproto
deleted file mode 100644
index 601d60dd..00000000
--- a/aconfig/trunk_staging/com.android.managedprovisioning.flags/terms_view_accessibility_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.managedprovisioning.flags"
-  name: "terms_view_accessibility_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.managedprovisioning.flags/underline_policy_link_flag_values.textproto b/aconfig/trunk_staging/com.android.managedprovisioning.flags/underline_policy_link_flag_values.textproto
deleted file mode 100644
index d363e2c0..00000000
--- a/aconfig/trunk_staging/com.android.managedprovisioning.flags/underline_policy_link_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.managedprovisioning.flags"
-  name: "underline_policy_link"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.aaudio/Android.bp b/aconfig/trunk_staging/com.android.media.aaudio/Android.bp
deleted file mode 100644
index 91483908..00000000
--- a/aconfig/trunk_staging/com.android.media.aaudio/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.media.aaudio-all",
-    package: "com.android.media.aaudio",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.media.aaudio/offload_support_flag_values.textproto b/aconfig/trunk_staging/com.android.media.aaudio/offload_support_flag_values.textproto
deleted file mode 100644
index e46bc470..00000000
--- a/aconfig/trunk_staging/com.android.media.aaudio/offload_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.aaudio"
-  name: "offload_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.aaudio/sample_rate_conversion_flag_values.textproto b/aconfig/trunk_staging/com.android.media.aaudio/sample_rate_conversion_flag_values.textproto
deleted file mode 100644
index 232d1d26..00000000
--- a/aconfig/trunk_staging/com.android.media.aaudio/sample_rate_conversion_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.aaudio"
-  name: "sample_rate_conversion"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.aaudio/start_stop_client_from_command_thread_flag_values.textproto b/aconfig/trunk_staging/com.android.media.aaudio/start_stop_client_from_command_thread_flag_values.textproto
deleted file mode 100644
index 72013c06..00000000
--- a/aconfig/trunk_staging/com.android.media.aaudio/start_stop_client_from_command_thread_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.aaudio"
-  name: "start_stop_client_from_command_thread"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/Android.bp b/aconfig/trunk_staging/com.android.media.audio/Android.bp
deleted file mode 100644
index b3db76d7..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.media.audio-all",
-    package: "com.android.media.audio",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/abs_volume_index_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/abs_volume_index_fix_flag_values.textproto
deleted file mode 100644
index 85260e61..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/abs_volume_index_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "abs_volume_index_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/alarm_min_volume_zero_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/alarm_min_volume_zero_flag_values.textproto
deleted file mode 100644
index ea35ef31..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/alarm_min_volume_zero_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "alarm_min_volume_zero"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/as_device_connection_failure_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/as_device_connection_failure_flag_values.textproto
deleted file mode 100644
index e98f2fe6..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/as_device_connection_failure_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "as_device_connection_failure"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/audio_eraser_effect_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/audio_eraser_effect_flag_values.textproto
deleted file mode 100644
index 10f757b7..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/audio_eraser_effect_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "audio_eraser_effect"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/audioserver_permissions_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/audioserver_permissions_flag_values.textproto
deleted file mode 100644
index 868cd098..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/audioserver_permissions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "audioserver_permissions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/bluetooth_mac_address_anonymization_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/bluetooth_mac_address_anonymization_flag_values.textproto
deleted file mode 100644
index ac82b0f6..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/bluetooth_mac_address_anonymization_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "bluetooth_mac_address_anonymization"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/defer_wear_permission_updates_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/defer_wear_permission_updates_flag_values.textproto
deleted file mode 100644
index 8f46873c..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/defer_wear_permission_updates_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "defer_wear_permission_updates"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/disable_prescale_absolute_volume_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/disable_prescale_absolute_volume_flag_values.textproto
deleted file mode 100644
index 62b64a9f..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/disable_prescale_absolute_volume_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "disable_prescale_absolute_volume"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/dsa_over_bt_le_audio_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/dsa_over_bt_le_audio_flag_values.textproto
deleted file mode 100644
index 45cd44d9..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/dsa_over_bt_le_audio_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "dsa_over_bt_le_audio"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/equal_sco_lea_vc_index_range_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/equal_sco_lea_vc_index_range_flag_values.textproto
deleted file mode 100644
index 7349c265..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/equal_sco_lea_vc_index_range_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "equal_sco_lea_vc_index_range"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/hardening_impl_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/hardening_impl_flag_values.textproto
deleted file mode 100644
index 1f315330..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/hardening_impl_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "hardening_impl"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/hardening_partial_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/hardening_partial_flag_values.textproto
deleted file mode 100644
index 6e8ea3c9..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/hardening_partial_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "hardening_partial"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/hardening_partial_volume_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/hardening_partial_volume_flag_values.textproto
deleted file mode 100644
index 240008f7..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/hardening_partial_volume_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "hardening_partial_volume"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/hardening_strict_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/hardening_strict_flag_values.textproto
deleted file mode 100644
index c9b9cfc2..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/hardening_strict_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "hardening_strict"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/music_fx_edge_to_edge_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/music_fx_edge_to_edge_flag_values.textproto
deleted file mode 100644
index bf2df05b..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/music_fx_edge_to_edge_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "music_fx_edge_to_edge"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/optimize_bt_device_switch_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/optimize_bt_device_switch_flag_values.textproto
deleted file mode 100644
index 286ae961..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/optimize_bt_device_switch_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "optimize_bt_device_switch"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/port_to_piid_simplification_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/port_to_piid_simplification_flag_values.textproto
deleted file mode 100644
index f27f67ca..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/port_to_piid_simplification_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "port_to_piid_simplification"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/replace_stream_bt_sco_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/replace_stream_bt_sco_flag_values.textproto
deleted file mode 100644
index dedd64b8..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/replace_stream_bt_sco_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "replace_stream_bt_sco"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/ring_my_car_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/ring_my_car_flag_values.textproto
deleted file mode 100644
index d7deda38..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/ring_my_car_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "ring_my_car"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/ringer_mode_affects_alarm_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/ringer_mode_affects_alarm_flag_values.textproto
deleted file mode 100644
index 96b95e63..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/ringer_mode_affects_alarm_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "ringer_mode_affects_alarm"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/set_stream_volume_order_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/set_stream_volume_order_flag_values.textproto
deleted file mode 100644
index a9329613..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/set_stream_volume_order_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "set_stream_volume_order"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/spatializer_offload_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/spatializer_offload_flag_values.textproto
deleted file mode 100644
index fbb02555..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/spatializer_offload_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "spatializer_offload"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/spatializer_upmix_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/spatializer_upmix_flag_values.textproto
deleted file mode 100644
index adac97b3..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/spatializer_upmix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "spatializer_upmix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/stereo_spatialization_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/stereo_spatialization_flag_values.textproto
deleted file mode 100644
index 69b0fe34..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/stereo_spatialization_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "stereo_spatialization"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/vgs_vss_sync_mute_order_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/vgs_vss_sync_mute_order_flag_values.textproto
deleted file mode 100644
index 155f6702..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/vgs_vss_sync_mute_order_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "vgs_vss_sync_mute_order"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audio/volume_refactoring_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/volume_refactoring_flag_values.textproto
deleted file mode 100644
index 6bbfb607..00000000
--- a/aconfig/trunk_staging/com.android.media.audio/volume_refactoring_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audio"
-  name: "volume_refactoring"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audioclient/Android.bp b/aconfig/trunk_staging/com.android.media.audioclient/Android.bp
deleted file mode 100644
index 82d3f39d..00000000
--- a/aconfig/trunk_staging/com.android.media.audioclient/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.media.audioclient-all",
-  package: "com.android.media.audioclient",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.media.audioclient/audiosystem_service_acquisition_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audioclient/audiosystem_service_acquisition_flag_values.textproto
deleted file mode 100644
index 224abc23..00000000
--- a/aconfig/trunk_staging/com.android.media.audioclient/audiosystem_service_acquisition_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audioclient"
-  name: "audiosystem_service_acquisition"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audioserver/Android.bp b/aconfig/trunk_staging/com.android.media.audioserver/Android.bp
deleted file mode 100644
index beddb6b1..00000000
--- a/aconfig/trunk_staging/com.android.media.audioserver/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.media.audioserver-all",
-    package: "com.android.media.audioserver",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.media.audioserver/conditionally_ignore_preferred_input_device_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audioserver/conditionally_ignore_preferred_input_device_flag_values.textproto
deleted file mode 100644
index e63b389a..00000000
--- a/aconfig/trunk_staging/com.android.media.audioserver/conditionally_ignore_preferred_input_device_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audioserver"
-  name: "conditionally_ignore_preferred_input_device"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audioserver/direct_track_reprioritization_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audioserver/direct_track_reprioritization_flag_values.textproto
deleted file mode 100644
index 829835dc..00000000
--- a/aconfig/trunk_staging/com.android.media.audioserver/direct_track_reprioritization_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audioserver"
-  name: "direct_track_reprioritization"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audioserver/effect_chain_callback_improve_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audioserver/effect_chain_callback_improve_flag_values.textproto
deleted file mode 100644
index 079f59e5..00000000
--- a/aconfig/trunk_staging/com.android.media.audioserver/effect_chain_callback_improve_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audioserver"
-  name: "effect_chain_callback_improve"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audioserver/enable_audio_input_device_routing_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audioserver/enable_audio_input_device_routing_flag_values.textproto
deleted file mode 100644
index ca744957..00000000
--- a/aconfig/trunk_staging/com.android.media.audioserver/enable_audio_input_device_routing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audioserver"
-  name: "enable_audio_input_device_routing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audioserver/enable_gmap_mode_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audioserver/enable_gmap_mode_flag_values.textproto
deleted file mode 100644
index 156e3438..00000000
--- a/aconfig/trunk_staging/com.android.media.audioserver/enable_gmap_mode_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audioserver"
-  name: "enable_gmap_mode"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audioserver/fdtostring_timeout_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audioserver/fdtostring_timeout_fix_flag_values.textproto
deleted file mode 100644
index fd8b59ff..00000000
--- a/aconfig/trunk_staging/com.android.media.audioserver/fdtostring_timeout_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audioserver"
-  name: "fdtostring_timeout_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audioserver/fix_aaudio_stream_reopen_in_libaudiohal_aidl_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audioserver/fix_aaudio_stream_reopen_in_libaudiohal_aidl_flag_values.textproto
deleted file mode 100644
index 55885ea7..00000000
--- a/aconfig/trunk_staging/com.android.media.audioserver/fix_aaudio_stream_reopen_in_libaudiohal_aidl_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audioserver"
-  name: "fix_aaudio_stream_reopen_in_libaudiohal_aidl"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audioserver/fix_call_audio_patch_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audioserver/fix_call_audio_patch_flag_values.textproto
deleted file mode 100644
index ee6bd850..00000000
--- a/aconfig/trunk_staging/com.android.media.audioserver/fix_call_audio_patch_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audioserver"
-  name: "fix_call_audio_patch"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audioserver/fix_concurrent_playback_behavior_with_bit_perfect_client_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audioserver/fix_concurrent_playback_behavior_with_bit_perfect_client_flag_values.textproto
deleted file mode 100644
index 662b1ab4..00000000
--- a/aconfig/trunk_staging/com.android.media.audioserver/fix_concurrent_playback_behavior_with_bit_perfect_client_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audioserver"
-  name: "fix_concurrent_playback_behavior_with_bit_perfect_client"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audioserver/fix_input_sharing_logic_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audioserver/fix_input_sharing_logic_flag_values.textproto
deleted file mode 100644
index 4ea44c0f..00000000
--- a/aconfig/trunk_staging/com.android.media.audioserver/fix_input_sharing_logic_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audioserver"
-  name: "fix_input_sharing_logic"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audioserver/mutex_priority_inheritance_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audioserver/mutex_priority_inheritance_flag_values.textproto
deleted file mode 100644
index 04fe40a6..00000000
--- a/aconfig/trunk_staging/com.android.media.audioserver/mutex_priority_inheritance_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audioserver"
-  name: "mutex_priority_inheritance"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audioserver/portid_volume_management_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audioserver/portid_volume_management_flag_values.textproto
deleted file mode 100644
index 158fc110..00000000
--- a/aconfig/trunk_staging/com.android.media.audioserver/portid_volume_management_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audioserver"
-  name: "portid_volume_management"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audioserver/power_stats_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audioserver/power_stats_flag_values.textproto
deleted file mode 100644
index 21d2228f..00000000
--- a/aconfig/trunk_staging/com.android.media.audioserver/power_stats_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audioserver"
-  name: "power_stats"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.audioserver/use_bt_sco_for_media_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audioserver/use_bt_sco_for_media_flag_values.textproto
deleted file mode 100644
index c1caadf8..00000000
--- a/aconfig/trunk_staging/com.android.media.audioserver/use_bt_sco_for_media_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.audioserver"
-  name: "use_bt_sco_for_media"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.codec.flags/Android.bp b/aconfig/trunk_staging/com.android.media.codec.flags/Android.bp
deleted file mode 100644
index ffe5a46f..00000000
--- a/aconfig/trunk_staging/com.android.media.codec.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.media.codec.flags-all",
-  package: "com.android.media.codec.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.media.codec.flags/aidl_hal_flag_values.textproto b/aconfig/trunk_staging/com.android.media.codec.flags/aidl_hal_flag_values.textproto
deleted file mode 100644
index c6fb8699..00000000
--- a/aconfig/trunk_staging/com.android.media.codec.flags/aidl_hal_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.codec.flags"
-  name: "aidl_hal"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.codec.flags/codec_importance_flag_values.textproto b/aconfig/trunk_staging/com.android.media.codec.flags/codec_importance_flag_values.textproto
deleted file mode 100644
index 4d4b0986..00000000
--- a/aconfig/trunk_staging/com.android.media.codec.flags/codec_importance_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.codec.flags"
-  name: "codec_importance"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.codec.flags/large_audio_frame_flag_values.textproto b/aconfig/trunk_staging/com.android.media.codec.flags/large_audio_frame_flag_values.textproto
deleted file mode 100644
index 65226aab..00000000
--- a/aconfig/trunk_staging/com.android.media.codec.flags/large_audio_frame_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.codec.flags"
-  name: "large_audio_frame"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.editing.flags/Android.bp b/aconfig/trunk_staging/com.android.media.editing.flags/Android.bp
deleted file mode 100644
index 64603919..00000000
--- a/aconfig/trunk_staging/com.android.media.editing.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.media.editing.flags-all",
-    package: "com.android.media.editing.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.media.editing.flags/add_media_metrics_editing_flag_values.textproto b/aconfig/trunk_staging/com.android.media.editing.flags/add_media_metrics_editing_flag_values.textproto
deleted file mode 100644
index 77e7c95e..00000000
--- a/aconfig/trunk_staging/com.android.media.editing.flags/add_media_metrics_editing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.editing.flags"
-  name: "add_media_metrics_editing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.editing.flags/muxer_mp4_enable_apv_flag_values.textproto b/aconfig/trunk_staging/com.android.media.editing.flags/muxer_mp4_enable_apv_flag_values.textproto
deleted file mode 100644
index 8a143945..00000000
--- a/aconfig/trunk_staging/com.android.media.editing.flags/muxer_mp4_enable_apv_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.editing.flags"
-  name: "muxer_mp4_enable_apv"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.editing.flags/stagefrightrecorder_enable_b_frames_flag_values.textproto b/aconfig/trunk_staging/com.android.media.editing.flags/stagefrightrecorder_enable_b_frames_flag_values.textproto
deleted file mode 100644
index fd286bf7..00000000
--- a/aconfig/trunk_staging/com.android.media.editing.flags/stagefrightrecorder_enable_b_frames_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.editing.flags"
-  name: "stagefrightrecorder_enable_b_frames"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.extractor.flags/Android.bp b/aconfig/trunk_staging/com.android.media.extractor.flags/Android.bp
deleted file mode 100644
index 84ec19b2..00000000
--- a/aconfig/trunk_staging/com.android.media.extractor.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.media.extractor.flags-all",
-    package: "com.android.media.extractor.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.media.extractor.flags/extractor_mp4_enable_apv_flag_values.textproto b/aconfig/trunk_staging/com.android.media.extractor.flags/extractor_mp4_enable_apv_flag_values.textproto
deleted file mode 100644
index 9bf9ca73..00000000
--- a/aconfig/trunk_staging/com.android.media.extractor.flags/extractor_mp4_enable_apv_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.extractor.flags"
-  name: "extractor_mp4_enable_apv"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.media.extractor.flags/extractor_sniff_midi_optimizations_flag_values.textproto b/aconfig/trunk_staging/com.android.media.extractor.flags/extractor_sniff_midi_optimizations_flag_values.textproto
deleted file mode 100644
index 959b38e8..00000000
--- a/aconfig/trunk_staging/com.android.media.extractor.flags/extractor_sniff_midi_optimizations_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.extractor.flags"
-  name: "extractor_sniff_midi_optimizations"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/Android.bp b/aconfig/trunk_staging/com.android.media.flags/Android.bp
deleted file mode 100644
index 8450569b..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.media.flags-all",
-    package: "com.android.media.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/adjust_volume_for_foreground_app_playing_audio_without_media_session_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/adjust_volume_for_foreground_app_playing_audio_without_media_session_flag_values.textproto
deleted file mode 100644
index 7b009604..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/adjust_volume_for_foreground_app_playing_audio_without_media_session_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "adjust_volume_for_foreground_app_playing_audio_without_media_session"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/disable_transfer_when_apps_do_not_support_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/disable_transfer_when_apps_do_not_support_flag_values.textproto
deleted file mode 100644
index 6d56f2c1..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/disable_transfer_when_apps_do_not_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "disable_transfer_when_apps_do_not_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/enable_audio_policies_device_and_bluetooth_controller_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/enable_audio_policies_device_and_bluetooth_controller_flag_values.textproto
deleted file mode 100644
index 9afff7d6..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/enable_audio_policies_device_and_bluetooth_controller_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "enable_audio_policies_device_and_bluetooth_controller"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/enable_built_in_speaker_route_suitability_statuses_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/enable_built_in_speaker_route_suitability_statuses_flag_values.textproto
deleted file mode 100644
index 107d9bb5..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/enable_built_in_speaker_route_suitability_statuses_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "enable_built_in_speaker_route_suitability_statuses"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/enable_cross_user_routing_in_media_router2_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/enable_cross_user_routing_in_media_router2_flag_values.textproto
deleted file mode 100644
index 2c507680..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/enable_cross_user_routing_in_media_router2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "enable_cross_user_routing_in_media_router2"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/enable_fix_for_empty_system_routes_crash_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/enable_fix_for_empty_system_routes_crash_flag_values.textproto
deleted file mode 100644
index 58359153..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/enable_fix_for_empty_system_routes_crash_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "enable_fix_for_empty_system_routes_crash"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/enable_full_scan_with_media_content_control_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/enable_full_scan_with_media_content_control_flag_values.textproto
deleted file mode 100644
index e52557f1..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/enable_full_scan_with_media_content_control_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "enable_full_scan_with_media_content_control"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/enable_get_transferable_routes_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/enable_get_transferable_routes_flag_values.textproto
deleted file mode 100644
index 0e233d91..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/enable_get_transferable_routes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "enable_get_transferable_routes"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/enable_media_route_2_info_provider_package_name_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/enable_media_route_2_info_provider_package_name_flag_values.textproto
deleted file mode 100644
index 3e06d28c..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/enable_media_route_2_info_provider_package_name_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "enable_media_route_2_info_provider_package_name"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/enable_mr2_service_non_main_bg_thread_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/enable_mr2_service_non_main_bg_thread_flag_values.textproto
deleted file mode 100644
index dffe0f75..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/enable_mr2_service_non_main_bg_thread_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "enable_mr2_service_non_main_bg_thread"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/enable_new_media_route_2_info_types_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/enable_new_media_route_2_info_types_flag_values.textproto
deleted file mode 100644
index 917ef8e6..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/enable_new_media_route_2_info_types_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "enable_new_media_route_2_info_types"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/enable_new_wired_media_route_2_info_types_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/enable_new_wired_media_route_2_info_types_flag_values.textproto
deleted file mode 100644
index bc222092..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/enable_new_wired_media_route_2_info_types_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "enable_new_wired_media_route_2_info_types"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/enable_notifying_activity_manager_with_media_session_status_change_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/enable_notifying_activity_manager_with_media_session_status_change_flag_values.textproto
deleted file mode 100644
index 379dac6a..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/enable_notifying_activity_manager_with_media_session_status_change_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "enable_notifying_activity_manager_with_media_session_status_change"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/enable_null_session_in_media_browser_service_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/enable_null_session_in_media_browser_service_flag_values.textproto
deleted file mode 100644
index 3e2f5110..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/enable_null_session_in_media_browser_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "enable_null_session_in_media_browser_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/enable_output_switcher_device_grouping_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/enable_output_switcher_device_grouping_flag_values.textproto
deleted file mode 100644
index 4a464fed..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/enable_output_switcher_device_grouping_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "enable_output_switcher_device_grouping"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/enable_output_switcher_redesign_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/enable_output_switcher_redesign_flag_values.textproto
deleted file mode 100644
index 444ad5d9..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/enable_output_switcher_redesign_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "enable_output_switcher_redesign"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/enable_prevention_of_keep_alive_route_providers_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/enable_prevention_of_keep_alive_route_providers_flag_values.textproto
deleted file mode 100644
index 73b0b2ea..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/enable_prevention_of_keep_alive_route_providers_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "enable_prevention_of_keep_alive_route_providers"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/enable_prevention_of_manager_scans_when_no_apps_scan_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/enable_prevention_of_manager_scans_when_no_apps_scan_flag_values.textproto
deleted file mode 100644
index d172b664..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/enable_prevention_of_manager_scans_when_no_apps_scan_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "enable_prevention_of_manager_scans_when_no_apps_scan"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/enable_privileged_routing_for_media_routing_control_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/enable_privileged_routing_for_media_routing_control_flag_values.textproto
deleted file mode 100644
index 3bd3e3b4..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/enable_privileged_routing_for_media_routing_control_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "enable_privileged_routing_for_media_routing_control"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/enable_rlp_callbacks_in_media_router2_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/enable_rlp_callbacks_in_media_router2_flag_values.textproto
deleted file mode 100644
index af33c585..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/enable_rlp_callbacks_in_media_router2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "enable_rlp_callbacks_in_media_router2"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/enable_route_visibility_control_api_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/enable_route_visibility_control_api_flag_values.textproto
deleted file mode 100644
index a4cf3768..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/enable_route_visibility_control_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "enable_route_visibility_control_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/enable_screen_off_scanning_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/enable_screen_off_scanning_flag_values.textproto
deleted file mode 100644
index 4ead9e47..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/enable_screen_off_scanning_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "enable_screen_off_scanning"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/enable_use_of_bluetooth_device_get_alias_for_mr2info_get_name_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/enable_use_of_bluetooth_device_get_alias_for_mr2info_get_name_flag_values.textproto
deleted file mode 100644
index a095ce1e..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/enable_use_of_bluetooth_device_get_alias_for_mr2info_get_name_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "enable_use_of_bluetooth_device_get_alias_for_mr2info_get_name"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/enable_use_of_singleton_audio_manager_route_controller_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/enable_use_of_singleton_audio_manager_route_controller_flag_values.textproto
deleted file mode 100644
index b97fa2ba..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/enable_use_of_singleton_audio_manager_route_controller_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "enable_use_of_singleton_audio_manager_route_controller"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/enable_waiting_state_for_system_session_creation_request_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/enable_waiting_state_for_system_session_creation_request_flag_values.textproto
deleted file mode 100644
index 90b84be4..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/enable_waiting_state_for_system_session_creation_request_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "enable_waiting_state_for_system_session_creation_request"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/fallback_to_default_handling_when_media_session_has_fixed_volume_handling_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/fallback_to_default_handling_when_media_session_has_fixed_volume_handling_flag_values.textproto
deleted file mode 100644
index e8fb34a3..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/fallback_to_default_handling_when_media_session_has_fixed_volume_handling_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "fallback_to_default_handling_when_media_session_has_fixed_volume_handling"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.flags/fix_output_media_item_list_index_out_of_bounds_exception_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/fix_output_media_item_list_index_out_of_bounds_exception_flag_values.textproto
deleted file mode 100644
index 469b14c5..00000000
--- a/aconfig/trunk_staging/com.android.media.flags/fix_output_media_item_list_index_out_of_bounds_exception_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.flags"
-  name: "fix_output_media_item_list_index_out_of_bounds_exception"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.mainline.flags/Android.bp b/aconfig/trunk_staging/com.android.media.mainline.flags/Android.bp
deleted file mode 100644
index df979924..00000000
--- a/aconfig/trunk_staging/com.android.media.mainline.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.media.mainline.flags-all",
-  package: "com.android.media.mainline.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.media.mainline.flags/enable_pid_to_media_session_2_flag_values.textproto b/aconfig/trunk_staging/com.android.media.mainline.flags/enable_pid_to_media_session_2_flag_values.textproto
deleted file mode 100644
index 0636586e..00000000
--- a/aconfig/trunk_staging/com.android.media.mainline.flags/enable_pid_to_media_session_2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.mainline.flags"
-  name: "enable_pid_to_media_session_2"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.media.metrics.flags/Android.bp b/aconfig/trunk_staging/com.android.media.metrics.flags/Android.bp
deleted file mode 100644
index 9f64b526..00000000
--- a/aconfig/trunk_staging/com.android.media.metrics.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.media.metrics.flags-all",
-    package: "com.android.media.metrics.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.media.metrics.flags/mediametrics_to_module_flag_values.textproto b/aconfig/trunk_staging/com.android.media.metrics.flags/mediametrics_to_module_flag_values.textproto
deleted file mode 100644
index 57fe1e6e..00000000
--- a/aconfig/trunk_staging/com.android.media.metrics.flags/mediametrics_to_module_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.metrics.flags"
-  name: "mediametrics_to_module"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.performance.flags/Android.bp b/aconfig/trunk_staging/com.android.media.performance.flags/Android.bp
deleted file mode 100644
index b40ad8a3..00000000
--- a/aconfig/trunk_staging/com.android.media.performance.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.media.performance.flags-all",
-  package: "com.android.media.performance.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.media.performance.flags/media_description_ashmem_bitmap_flag_values.textproto b/aconfig/trunk_staging/com.android.media.performance.flags/media_description_ashmem_bitmap_flag_values.textproto
deleted file mode 100644
index 7e80c5a3..00000000
--- a/aconfig/trunk_staging/com.android.media.performance.flags/media_description_ashmem_bitmap_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.performance.flags"
-  name: "media_description_ashmem_bitmap"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.playback.flags/Android.bp b/aconfig/trunk_staging/com.android.media.playback.flags/Android.bp
deleted file mode 100644
index 4830d78e..00000000
--- a/aconfig/trunk_staging/com.android.media.playback.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.media.playback.flags-all",
-  package: "com.android.media.playback.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.media.playback.flags/mediametadataretriever_default_rgba8888_flag_values.textproto b/aconfig/trunk_staging/com.android.media.playback.flags/mediametadataretriever_default_rgba8888_flag_values.textproto
deleted file mode 100644
index 363044fc..00000000
--- a/aconfig/trunk_staging/com.android.media.playback.flags/mediametadataretriever_default_rgba8888_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.playback.flags"
-  name: "mediametadataretriever_default_rgba8888"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.projection.flags/Android.bp b/aconfig/trunk_staging/com.android.media.projection.flags/Android.bp
deleted file mode 100644
index a6fd9eee..00000000
--- a/aconfig/trunk_staging/com.android.media.projection.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.media.projection.flags-all",
-    package: "com.android.media.projection.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.media.projection.flags/limit_manage_media_projection_flag_values.textproto b/aconfig/trunk_staging/com.android.media.projection.flags/limit_manage_media_projection_flag_values.textproto
deleted file mode 100644
index 00a8e7e2..00000000
--- a/aconfig/trunk_staging/com.android.media.projection.flags/limit_manage_media_projection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.projection.flags"
-  name: "limit_manage_media_projection"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.media.projection.flags/media_projection_connected_display_flag_values.textproto b/aconfig/trunk_staging/com.android.media.projection.flags/media_projection_connected_display_flag_values.textproto
deleted file mode 100644
index c86322a6..00000000
--- a/aconfig/trunk_staging/com.android.media.projection.flags/media_projection_connected_display_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.projection.flags"
-  name: "media_projection_connected_display"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.projection.flags/media_projection_connected_display_no_virtual_device_flag_values.textproto b/aconfig/trunk_staging/com.android.media.projection.flags/media_projection_connected_display_no_virtual_device_flag_values.textproto
deleted file mode 100644
index a6f3f5b7..00000000
--- a/aconfig/trunk_staging/com.android.media.projection.flags/media_projection_connected_display_no_virtual_device_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.projection.flags"
-  name: "media_projection_connected_display_no_virtual_device"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.projection.flags/show_stop_dialog_post_call_end_flag_values.textproto b/aconfig/trunk_staging/com.android.media.projection.flags/show_stop_dialog_post_call_end_flag_values.textproto
deleted file mode 100644
index 52575300..00000000
--- a/aconfig/trunk_staging/com.android.media.projection.flags/show_stop_dialog_post_call_end_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.projection.flags"
-  name: "show_stop_dialog_post_call_end"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.media.projection.flags/stop_media_projection_on_call_end_flag_values.textproto b/aconfig/trunk_staging/com.android.media.projection.flags/stop_media_projection_on_call_end_flag_values.textproto
deleted file mode 100644
index 7448eb5a..00000000
--- a/aconfig/trunk_staging/com.android.media.projection.flags/stop_media_projection_on_call_end_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.media.projection.flags"
-  name: "stop_media_projection_on_call_end"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.nearby.flags/Android.bp b/aconfig/trunk_staging/com.android.nearby.flags/Android.bp
deleted file mode 100644
index 814a17cd..00000000
--- a/aconfig/trunk_staging/com.android.nearby.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.nearby.flags-all",
-  package: "com.android.nearby.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.nearby.flags/powered_off_finding_flag_values.textproto b/aconfig/trunk_staging/com.android.nearby.flags/powered_off_finding_flag_values.textproto
deleted file mode 100644
index f593883a..00000000
--- a/aconfig/trunk_staging/com.android.nearby.flags/powered_off_finding_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.nearby.flags"
-  name: "powered_off_finding"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.net.ct.flags/Android.bp b/aconfig/trunk_staging/com.android.net.ct.flags/Android.bp
deleted file mode 100644
index 6388efa9..00000000
--- a/aconfig/trunk_staging/com.android.net.ct.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.net.ct.flags-all",
-    package: "com.android.net.ct.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.net.ct.flags/certificate_transparency_job_flag_values.textproto b/aconfig/trunk_staging/com.android.net.ct.flags/certificate_transparency_job_flag_values.textproto
deleted file mode 100644
index 6ffabf9e..00000000
--- a/aconfig/trunk_staging/com.android.net.ct.flags/certificate_transparency_job_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.net.ct.flags"
-  name: "certificate_transparency_job"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.net.ct.flags/certificate_transparency_service_flag_values.textproto b/aconfig/trunk_staging/com.android.net.ct.flags/certificate_transparency_service_flag_values.textproto
deleted file mode 100644
index 19d676b8..00000000
--- a/aconfig/trunk_staging/com.android.net.ct.flags/certificate_transparency_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.net.ct.flags"
-  name: "certificate_transparency_service"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.net.flags/Android.bp b/aconfig/trunk_staging/com.android.net.flags/Android.bp
deleted file mode 100644
index 87821835..00000000
--- a/aconfig/trunk_staging/com.android.net.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.net.flags-all",
-    package: "com.android.net.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.net.flags/basic_background_restrictions_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.net.flags/basic_background_restrictions_enabled_flag_values.textproto
deleted file mode 100644
index 5d73a596..00000000
--- a/aconfig/trunk_staging/com.android.net.flags/basic_background_restrictions_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.net.flags"
-  name: "basic_background_restrictions_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.net.flags/ipsec_transform_state_flag_values.textproto b/aconfig/trunk_staging/com.android.net.flags/ipsec_transform_state_flag_values.textproto
deleted file mode 100644
index eb927bd7..00000000
--- a/aconfig/trunk_staging/com.android.net.flags/ipsec_transform_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.net.flags"
-  name: "ipsec_transform_state"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.net.flags/ipv6_over_ble_flag_values.textproto b/aconfig/trunk_staging/com.android.net.flags/ipv6_over_ble_flag_values.textproto
deleted file mode 100644
index 97e2d617..00000000
--- a/aconfig/trunk_staging/com.android.net.flags/ipv6_over_ble_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.net.flags"
-  name: "ipv6_over_ble"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.net.flags/net_capability_local_network_flag_values.textproto b/aconfig/trunk_staging/com.android.net.flags/net_capability_local_network_flag_values.textproto
deleted file mode 100644
index 3b944f27..00000000
--- a/aconfig/trunk_staging/com.android.net.flags/net_capability_local_network_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.net.flags"
-  name: "net_capability_local_network"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.net.flags/net_capability_not_bandwidth_constrained_flag_values.textproto b/aconfig/trunk_staging/com.android.net.flags/net_capability_not_bandwidth_constrained_flag_values.textproto
deleted file mode 100644
index b47d9c22..00000000
--- a/aconfig/trunk_staging/com.android.net.flags/net_capability_not_bandwidth_constrained_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.net.flags"
-  name: "net_capability_not_bandwidth_constrained"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.net.flags/netstats_add_entries_flag_values.textproto b/aconfig/trunk_staging/com.android.net.flags/netstats_add_entries_flag_values.textproto
deleted file mode 100644
index a1c91c95..00000000
--- a/aconfig/trunk_staging/com.android.net.flags/netstats_add_entries_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.net.flags"
-  name: "netstats_add_entries"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.net.flags/nsd_subtypes_support_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.net.flags/nsd_subtypes_support_enabled_flag_values.textproto
deleted file mode 100644
index c6b936da..00000000
--- a/aconfig/trunk_staging/com.android.net.flags/nsd_subtypes_support_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.net.flags"
-  name: "nsd_subtypes_support_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.net.flags/register_nsd_offload_engine_api_flag_values.textproto b/aconfig/trunk_staging/com.android.net.flags/register_nsd_offload_engine_api_flag_values.textproto
deleted file mode 100644
index d7429b56..00000000
--- a/aconfig/trunk_staging/com.android.net.flags/register_nsd_offload_engine_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.net.flags"
-  name: "register_nsd_offload_engine_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.net.flags/request_restricted_wifi_flag_values.textproto b/aconfig/trunk_staging/com.android.net.flags/request_restricted_wifi_flag_values.textproto
deleted file mode 100644
index ac5c9240..00000000
--- a/aconfig/trunk_staging/com.android.net.flags/request_restricted_wifi_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.net.flags"
-  name: "request_restricted_wifi"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.net.flags/set_data_saver_via_cm_flag_values.textproto b/aconfig/trunk_staging/com.android.net.flags/set_data_saver_via_cm_flag_values.textproto
deleted file mode 100644
index 2b4efc9e..00000000
--- a/aconfig/trunk_staging/com.android.net.flags/set_data_saver_via_cm_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.net.flags"
-  name: "set_data_saver_via_cm"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.net.flags/support_is_uid_networking_blocked_flag_values.textproto b/aconfig/trunk_staging/com.android.net.flags/support_is_uid_networking_blocked_flag_values.textproto
deleted file mode 100644
index 6907d4f7..00000000
--- a/aconfig/trunk_staging/com.android.net.flags/support_is_uid_networking_blocked_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.net.flags"
-  name: "support_is_uid_networking_blocked"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.net.flags/support_transport_satellite_flag_values.textproto b/aconfig/trunk_staging/com.android.net.flags/support_transport_satellite_flag_values.textproto
deleted file mode 100644
index 8c92b618..00000000
--- a/aconfig/trunk_staging/com.android.net.flags/support_transport_satellite_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.net.flags"
-  name: "support_transport_satellite"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.net.flags/tethering_request_virtual_flag_values.textproto b/aconfig/trunk_staging/com.android.net.flags/tethering_request_virtual_flag_values.textproto
deleted file mode 100644
index 728cd16d..00000000
--- a/aconfig/trunk_staging/com.android.net.flags/tethering_request_virtual_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.net.flags"
-  name: "tethering_request_virtual"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.net.flags/tethering_request_with_soft_ap_config_flag_values.textproto b/aconfig/trunk_staging/com.android.net.flags/tethering_request_with_soft_ap_config_flag_values.textproto
deleted file mode 100644
index ac8b60cf..00000000
--- a/aconfig/trunk_staging/com.android.net.flags/tethering_request_with_soft_ap_config_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.net.flags"
-  name: "tethering_request_with_soft_ap_config"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.net.flags/tethering_with_soft_ap_config_flag_values.textproto b/aconfig/trunk_staging/com.android.net.flags/tethering_with_soft_ap_config_flag_values.textproto
deleted file mode 100644
index ff61eba4..00000000
--- a/aconfig/trunk_staging/com.android.net.flags/tethering_with_soft_ap_config_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.net.flags"
-  name: "tethering_with_soft_ap_config"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.net.thread.flags/Android.bp b/aconfig/trunk_staging/com.android.net.thread.flags/Android.bp
deleted file mode 100644
index 5f0902a5..00000000
--- a/aconfig/trunk_staging/com.android.net.thread.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.net.thread.flags-all",
-    package: "com.android.net.thread.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.net.thread.flags/channel_max_powers_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.net.thread.flags/channel_max_powers_enabled_flag_values.textproto
deleted file mode 100644
index cf00f203..00000000
--- a/aconfig/trunk_staging/com.android.net.thread.flags/channel_max_powers_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.net.thread.flags"
-  name: "channel_max_powers_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.net.thread.flags/configuration_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.net.thread.flags/configuration_enabled_flag_values.textproto
deleted file mode 100644
index 76957a7b..00000000
--- a/aconfig/trunk_staging/com.android.net.thread.flags/configuration_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.net.thread.flags"
-  name: "configuration_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.net.thread.flags/epskc_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.net.thread.flags/epskc_enabled_flag_values.textproto
deleted file mode 100644
index 1d95d505..00000000
--- a/aconfig/trunk_staging/com.android.net.thread.flags/epskc_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.net.thread.flags"
-  name: "epskc_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.net.thread.flags/set_nat64_configuration_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.net.thread.flags/set_nat64_configuration_enabled_flag_values.textproto
deleted file mode 100644
index e9353631..00000000
--- a/aconfig/trunk_staging/com.android.net.thread.flags/set_nat64_configuration_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.net.thread.flags"
-  name: "set_nat64_configuration_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.net.thread.flags/thread_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.net.thread.flags/thread_enabled_flag_values.textproto
deleted file mode 100644
index db56d5ce..00000000
--- a/aconfig/trunk_staging/com.android.net.thread.flags/thread_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.net.thread.flags"
-  name: "thread_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.net.thread.platform.flags/Android.bp b/aconfig/trunk_staging/com.android.net.thread.platform.flags/Android.bp
deleted file mode 100644
index 577875a6..00000000
--- a/aconfig/trunk_staging/com.android.net.thread.platform.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.net.thread.platform.flags-all",
-  package: "com.android.net.thread.platform.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.net.thread.platform.flags/thread_enabled_platform_flag_values.textproto b/aconfig/trunk_staging/com.android.net.thread.platform.flags/thread_enabled_platform_flag_values.textproto
deleted file mode 100644
index cfc786b7..00000000
--- a/aconfig/trunk_staging/com.android.net.thread.platform.flags/thread_enabled_platform_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.net.thread.platform.flags"
-  name: "thread_enabled_platform"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.net.thread.platform.flags/thread_user_restriction_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.net.thread.platform.flags/thread_user_restriction_enabled_flag_values.textproto
deleted file mode 100644
index 21a56fde..00000000
--- a/aconfig/trunk_staging/com.android.net.thread.platform.flags/thread_user_restriction_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.net.thread.platform.flags"
-  name: "thread_user_restriction_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.nfc.flags/Android.bp b/aconfig/trunk_staging/com.android.nfc.flags/Android.bp
deleted file mode 100644
index 336f2d13..00000000
--- a/aconfig/trunk_staging/com.android.nfc.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.nfc.flags-all",
-    package: "com.android.nfc.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.nfc.flags/allow_multiple_hce_bindings_flag_values.textproto b/aconfig/trunk_staging/com.android.nfc.flags/allow_multiple_hce_bindings_flag_values.textproto
deleted file mode 100644
index d8d839cb..00000000
--- a/aconfig/trunk_staging/com.android.nfc.flags/allow_multiple_hce_bindings_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.nfc.flags"
-  name: "allow_multiple_hce_bindings"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.nfc.flags/auto_disable_observe_mode_flag_values.textproto b/aconfig/trunk_staging/com.android.nfc.flags/auto_disable_observe_mode_flag_values.textproto
deleted file mode 100644
index 20ffd5c3..00000000
--- a/aconfig/trunk_staging/com.android.nfc.flags/auto_disable_observe_mode_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.nfc.flags"
-  name: "auto_disable_observe_mode"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.nfc.flags/check_passed_in_package_flag_values.textproto b/aconfig/trunk_staging/com.android.nfc.flags/check_passed_in_package_flag_values.textproto
deleted file mode 100644
index ed3b4ed6..00000000
--- a/aconfig/trunk_staging/com.android.nfc.flags/check_passed_in_package_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.nfc.flags"
-  name: "check_passed_in_package"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.nfc.flags/coalesce_rf_events_flag_values.textproto b/aconfig/trunk_staging/com.android.nfc.flags/coalesce_rf_events_flag_values.textproto
deleted file mode 100644
index abf3bd83..00000000
--- a/aconfig/trunk_staging/com.android.nfc.flags/coalesce_rf_events_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.nfc.flags"
-  name: "coalesce_rf_events"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.nfc.flags/ee_aid_select_flag_values.textproto b/aconfig/trunk_staging/com.android.nfc.flags/ee_aid_select_flag_values.textproto
deleted file mode 100644
index 6951bff8..00000000
--- a/aconfig/trunk_staging/com.android.nfc.flags/ee_aid_select_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.nfc.flags"
-  name: "ee_aid_select"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.nfc.flags/enable_direct_boot_aware_flag_values.textproto b/aconfig/trunk_staging/com.android.nfc.flags/enable_direct_boot_aware_flag_values.textproto
deleted file mode 100644
index 45d3ab2a..00000000
--- a/aconfig/trunk_staging/com.android.nfc.flags/enable_direct_boot_aware_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.nfc.flags"
-  name: "enable_direct_boot_aware"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.nfc.flags/exit_frames_flag_values.textproto b/aconfig/trunk_staging/com.android.nfc.flags/exit_frames_flag_values.textproto
deleted file mode 100644
index 8abf3097..00000000
--- a/aconfig/trunk_staging/com.android.nfc.flags/exit_frames_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.nfc.flags"
-  name: "exit_frames"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.nfc.flags/nfc_alert_tag_app_launch_flag_values.textproto b/aconfig/trunk_staging/com.android.nfc.flags/nfc_alert_tag_app_launch_flag_values.textproto
deleted file mode 100644
index 2eb8ab81..00000000
--- a/aconfig/trunk_staging/com.android.nfc.flags/nfc_alert_tag_app_launch_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.nfc.flags"
-  name: "nfc_alert_tag_app_launch"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.nfc.flags/observe_mode_without_rf_flag_values.textproto b/aconfig/trunk_staging/com.android.nfc.flags/observe_mode_without_rf_flag_values.textproto
deleted file mode 100644
index faffa75e..00000000
--- a/aconfig/trunk_staging/com.android.nfc.flags/observe_mode_without_rf_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.nfc.flags"
-  name: "observe_mode_without_rf"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.nfc.flags/post_callbacks_flag_values.textproto b/aconfig/trunk_staging/com.android.nfc.flags/post_callbacks_flag_values.textproto
deleted file mode 100644
index ba7467ae..00000000
--- a/aconfig/trunk_staging/com.android.nfc.flags/post_callbacks_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.nfc.flags"
-  name: "post_callbacks"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.nfc.flags/reduce_state_transition_flag_values.textproto b/aconfig/trunk_staging/com.android.nfc.flags/reduce_state_transition_flag_values.textproto
deleted file mode 100644
index 6829d897..00000000
--- a/aconfig/trunk_staging/com.android.nfc.flags/reduce_state_transition_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.nfc.flags"
-  name: "reduce_state_transition"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.nfc.flags/send_view_intent_for_url_tag_dispatch_flag_values.textproto b/aconfig/trunk_staging/com.android.nfc.flags/send_view_intent_for_url_tag_dispatch_flag_values.textproto
deleted file mode 100644
index 57532a48..00000000
--- a/aconfig/trunk_staging/com.android.nfc.flags/send_view_intent_for_url_tag_dispatch_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.nfc.flags"
-  name: "send_view_intent_for_url_tag_dispatch"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.nfc.flags/statsd_ce_events_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.nfc.flags/statsd_ce_events_flag_flag_values.textproto
deleted file mode 100644
index c77848e0..00000000
--- a/aconfig/trunk_staging/com.android.nfc.flags/statsd_ce_events_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.nfc.flags"
-  name: "statsd_ce_events_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.nfc.flags/use_device_lock_listener_flag_values.textproto b/aconfig/trunk_staging/com.android.nfc.flags/use_device_lock_listener_flag_values.textproto
deleted file mode 100644
index 69bb540c..00000000
--- a/aconfig/trunk_staging/com.android.nfc.flags/use_device_lock_listener_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.nfc.flags"
-  name: "use_device_lock_listener"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.nfc.flags/use_new_observe_mode_cmd_flag_values.textproto b/aconfig/trunk_staging/com.android.nfc.flags/use_new_observe_mode_cmd_flag_values.textproto
deleted file mode 100644
index 497f7e48..00000000
--- a/aconfig/trunk_staging/com.android.nfc.flags/use_new_observe_mode_cmd_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.nfc.flags"
-  name: "use_new_observe_mode_cmd"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.nfc.module.flags/Android.bp b/aconfig/trunk_staging/com.android.nfc.module.flags/Android.bp
deleted file mode 100644
index 1683607c..00000000
--- a/aconfig/trunk_staging/com.android.nfc.module.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.nfc.module.flags-all",
-    package: "com.android.nfc.module.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.nfc.module.flags/nfc_hce_latency_events_flag_values.textproto b/aconfig/trunk_staging/com.android.nfc.module.flags/nfc_hce_latency_events_flag_values.textproto
deleted file mode 100644
index 07c754e7..00000000
--- a/aconfig/trunk_staging/com.android.nfc.module.flags/nfc_hce_latency_events_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.nfc.module.flags"
-  name: "nfc_hce_latency_events"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.nfc.nci.flags/Android.bp b/aconfig/trunk_staging/com.android.nfc.nci.flags/Android.bp
deleted file mode 100644
index d8d81c12..00000000
--- a/aconfig/trunk_staging/com.android.nfc.nci.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.nfc.nci.flags-all",
-  package: "com.android.nfc.nci.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.nfc.nci.flags/t5t_no_getsysinfo_flag_values.textproto b/aconfig/trunk_staging/com.android.nfc.nci.flags/t5t_no_getsysinfo_flag_values.textproto
deleted file mode 100644
index 9ee35ec6..00000000
--- a/aconfig/trunk_staging/com.android.nfc.nci.flags/t5t_no_getsysinfo_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.nfc.nci.flags"
-  name: "t5t_no_getsysinfo"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.org.conscrypt.flags/Android.bp b/aconfig/trunk_staging/com.android.org.conscrypt.flags/Android.bp
deleted file mode 100644
index 762b9277..00000000
--- a/aconfig/trunk_staging/com.android.org.conscrypt.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.org.conscrypt.flags-all",
-    package: "com.android.org.conscrypt.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.org.conscrypt.flags/certificate_transparency_checkservertrusted_api_flag_values.textproto b/aconfig/trunk_staging/com.android.org.conscrypt.flags/certificate_transparency_checkservertrusted_api_flag_values.textproto
deleted file mode 100644
index dc3193b5..00000000
--- a/aconfig/trunk_staging/com.android.org.conscrypt.flags/certificate_transparency_checkservertrusted_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.org.conscrypt.flags"
-  name: "certificate_transparency_checkservertrusted_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.org.conscrypt.flags/certificate_transparency_platform_flag_values.textproto b/aconfig/trunk_staging/com.android.org.conscrypt.flags/certificate_transparency_platform_flag_values.textproto
deleted file mode 100644
index 222891ae..00000000
--- a/aconfig/trunk_staging/com.android.org.conscrypt.flags/certificate_transparency_platform_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.org.conscrypt.flags"
-  name: "certificate_transparency_platform"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.org.conscrypt.flags/spake2plus_api_flag_values.textproto b/aconfig/trunk_staging/com.android.org.conscrypt.flags/spake2plus_api_flag_values.textproto
deleted file mode 100644
index e5a7e522..00000000
--- a/aconfig/trunk_staging/com.android.org.conscrypt.flags/spake2plus_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.org.conscrypt.flags"
-  name: "spake2plus_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.org.conscrypt/Android.bp b/aconfig/trunk_staging/com.android.org.conscrypt/Android.bp
deleted file mode 100644
index b935a12e..00000000
--- a/aconfig/trunk_staging/com.android.org.conscrypt/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.org.conscrypt-all",
-  package: "com.android.org.conscrypt",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.org.conscrypt/certificate_transparency_platform_flag_values.textproto b/aconfig/trunk_staging/com.android.org.conscrypt/certificate_transparency_platform_flag_values.textproto
deleted file mode 100644
index 18bcaee4..00000000
--- a/aconfig/trunk_staging/com.android.org.conscrypt/certificate_transparency_platform_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.org.conscrypt"
-  name: "certificate_transparency_platform"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.os.statsd.flags/Android.bp b/aconfig/trunk_staging/com.android.os.statsd.flags/Android.bp
deleted file mode 100644
index 5ce43773..00000000
--- a/aconfig/trunk_staging/com.android.os.statsd.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.os.statsd.flags-all",
-    package: "com.android.os.statsd.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.os.statsd.flags/enable_logging_rate_stats_collection_flag_values.textproto b/aconfig/trunk_staging/com.android.os.statsd.flags/enable_logging_rate_stats_collection_flag_values.textproto
deleted file mode 100644
index a45f677a..00000000
--- a/aconfig/trunk_staging/com.android.os.statsd.flags/enable_logging_rate_stats_collection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.os.statsd.flags"
-  name: "enable_logging_rate_stats_collection"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.os.statsd.flags/logging_rate_limit_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.os.statsd.flags/logging_rate_limit_enabled_flag_values.textproto
deleted file mode 100644
index 062d3cd3..00000000
--- a/aconfig/trunk_staging/com.android.os.statsd.flags/logging_rate_limit_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.os.statsd.flags"
-  name: "logging_rate_limit_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.os.statsd.flags/trigger_uprobestats_flag_values.textproto b/aconfig/trunk_staging/com.android.os.statsd.flags/trigger_uprobestats_flag_values.textproto
deleted file mode 100644
index 7eb0c9a3..00000000
--- a/aconfig/trunk_staging/com.android.os.statsd.flags/trigger_uprobestats_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.os.statsd.flags"
-  name: "trigger_uprobestats"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.os.statsd.flags/use_wait_for_service_api_flag_values.textproto b/aconfig/trunk_staging/com.android.os.statsd.flags/use_wait_for_service_api_flag_values.textproto
deleted file mode 100644
index de17e752..00000000
--- a/aconfig/trunk_staging/com.android.os.statsd.flags/use_wait_for_service_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.os.statsd.flags"
-  name: "use_wait_for_service_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.permission.flags/Android.bp b/aconfig/trunk_staging/com.android.permission.flags/Android.bp
deleted file mode 100644
index 4c0de955..00000000
--- a/aconfig/trunk_staging/com.android.permission.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.permission.flags-all",
-    package: "com.android.permission.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.permission.flags/add_banners_to_privacy_sensitive_apps_for_aaos_flag_values.textproto b/aconfig/trunk_staging/com.android.permission.flags/add_banners_to_privacy_sensitive_apps_for_aaos_flag_values.textproto
deleted file mode 100644
index ffca5cf1..00000000
--- a/aconfig/trunk_staging/com.android.permission.flags/add_banners_to_privacy_sensitive_apps_for_aaos_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.permission.flags"
-  name: "add_banners_to_privacy_sensitive_apps_for_aaos"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.permission.flags/app_permission_fragment_uses_preferences_flag_values.textproto b/aconfig/trunk_staging/com.android.permission.flags/app_permission_fragment_uses_preferences_flag_values.textproto
deleted file mode 100644
index 9bfa61af..00000000
--- a/aconfig/trunk_staging/com.android.permission.flags/app_permission_fragment_uses_preferences_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.permission.flags"
-  name: "app_permission_fragment_uses_preferences"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.permission.flags/archiving_read_only_flag_values.textproto b/aconfig/trunk_staging/com.android.permission.flags/archiving_read_only_flag_values.textproto
deleted file mode 100644
index e6f8fe7c..00000000
--- a/aconfig/trunk_staging/com.android.permission.flags/archiving_read_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.permission.flags"
-  name: "archiving_read_only"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.permission.flags/cross_user_role_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.permission.flags/cross_user_role_enabled_flag_values.textproto
deleted file mode 100644
index 018cdf8b..00000000
--- a/aconfig/trunk_staging/com.android.permission.flags/cross_user_role_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.permission.flags"
-  name: "cross_user_role_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.permission.flags/cross_user_role_ux_bugfix_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.permission.flags/cross_user_role_ux_bugfix_enabled_flag_values.textproto
deleted file mode 100644
index 824fa957..00000000
--- a/aconfig/trunk_staging/com.android.permission.flags/cross_user_role_ux_bugfix_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.permission.flags"
-  name: "cross_user_role_ux_bugfix_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.permission.flags/decluttered_permission_manager_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.permission.flags/decluttered_permission_manager_enabled_flag_values.textproto
deleted file mode 100644
index 666c0ad3..00000000
--- a/aconfig/trunk_staging/com.android.permission.flags/decluttered_permission_manager_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.permission.flags"
-  name: "decluttered_permission_manager_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.permission.flags/default_apps_recommendation_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.permission.flags/default_apps_recommendation_enabled_flag_values.textproto
deleted file mode 100644
index e015bff9..00000000
--- a/aconfig/trunk_staging/com.android.permission.flags/default_apps_recommendation_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.permission.flags"
-  name: "default_apps_recommendation_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.permission.flags/fix_safety_center_touch_target_flag_values.textproto b/aconfig/trunk_staging/com.android.permission.flags/fix_safety_center_touch_target_flag_values.textproto
deleted file mode 100644
index 739ca6f5..00000000
--- a/aconfig/trunk_staging/com.android.permission.flags/fix_safety_center_touch_target_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.permission.flags"
-  name: "fix_safety_center_touch_target"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.permission.flags/livedata_refactor_permission_timeline_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.permission.flags/livedata_refactor_permission_timeline_enabled_flag_values.textproto
deleted file mode 100644
index e70469de..00000000
--- a/aconfig/trunk_staging/com.android.permission.flags/livedata_refactor_permission_timeline_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.permission.flags"
-  name: "livedata_refactor_permission_timeline_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.permission.flags/odad_notifications_supported_flag_values.textproto b/aconfig/trunk_staging/com.android.permission.flags/odad_notifications_supported_flag_values.textproto
deleted file mode 100644
index 04eece3d..00000000
--- a/aconfig/trunk_staging/com.android.permission.flags/odad_notifications_supported_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.permission.flags"
-  name: "odad_notifications_supported"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.permission.flags/permission_timeline_attribution_label_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.permission.flags/permission_timeline_attribution_label_fix_flag_values.textproto
deleted file mode 100644
index 25dfd836..00000000
--- a/aconfig/trunk_staging/com.android.permission.flags/permission_timeline_attribution_label_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.permission.flags"
-  name: "permission_timeline_attribution_label_fix"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.permission.flags/private_profile_supported_flag_values.textproto b/aconfig/trunk_staging/com.android.permission.flags/private_profile_supported_flag_values.textproto
deleted file mode 100644
index 4278ceeb..00000000
--- a/aconfig/trunk_staging/com.android.permission.flags/private_profile_supported_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.permission.flags"
-  name: "private_profile_supported"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.permission.flags/private_profile_title_api_flag_values.textproto b/aconfig/trunk_staging/com.android.permission.flags/private_profile_title_api_flag_values.textproto
deleted file mode 100644
index 1d439a20..00000000
--- a/aconfig/trunk_staging/com.android.permission.flags/private_profile_title_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.permission.flags"
-  name: "private_profile_title_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.permission.flags/safety_center_enabled_no_device_config_flag_values.textproto b/aconfig/trunk_staging/com.android.permission.flags/safety_center_enabled_no_device_config_flag_values.textproto
deleted file mode 100644
index bea4bdbe..00000000
--- a/aconfig/trunk_staging/com.android.permission.flags/safety_center_enabled_no_device_config_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.permission.flags"
-  name: "safety_center_enabled_no_device_config"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.permission.flags/safety_center_issue_only_affects_group_status_flag_values.textproto b/aconfig/trunk_staging/com.android.permission.flags/safety_center_issue_only_affects_group_status_flag_values.textproto
deleted file mode 100644
index ea18cf39..00000000
--- a/aconfig/trunk_staging/com.android.permission.flags/safety_center_issue_only_affects_group_status_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.permission.flags"
-  name: "safety_center_issue_only_affects_group_status"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.permission.flags/wear_compose_material3_flag_values.textproto b/aconfig/trunk_staging/com.android.permission.flags/wear_compose_material3_flag_values.textproto
deleted file mode 100644
index 94ac3a72..00000000
--- a/aconfig/trunk_staging/com.android.permission.flags/wear_compose_material3_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.permission.flags"
-  name: "wear_compose_material3"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.permission.flags/wear_privacy_dashboard_enabled_read_only_flag_values.textproto b/aconfig/trunk_staging/com.android.permission.flags/wear_privacy_dashboard_enabled_read_only_flag_values.textproto
deleted file mode 100644
index a8f66fbf..00000000
--- a/aconfig/trunk_staging/com.android.permission.flags/wear_privacy_dashboard_enabled_read_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.permission.flags"
-  name: "wear_privacy_dashboard_enabled_read_only"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.printspooler.flags/Android.bp b/aconfig/trunk_staging/com.android.printspooler.flags/Android.bp
deleted file mode 100644
index ea4482a3..00000000
--- a/aconfig/trunk_staging/com.android.printspooler.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.printspooler.flags-all",
-    package: "com.android.printspooler.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.printspooler.flags/log_print_jobs_flag_values.textproto b/aconfig/trunk_staging/com.android.printspooler.flags/log_print_jobs_flag_values.textproto
deleted file mode 100644
index c46a1901..00000000
--- a/aconfig/trunk_staging/com.android.printspooler.flags/log_print_jobs_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.printspooler.flags"
-  name: "log_print_jobs"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.printspooler.flags/print_edge2edge_flag_values.textproto b/aconfig/trunk_staging/com.android.printspooler.flags/print_edge2edge_flag_values.textproto
deleted file mode 100644
index 5951e08a..00000000
--- a/aconfig/trunk_staging/com.android.printspooler.flags/print_edge2edge_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.printspooler.flags"
-  name: "print_edge2edge"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.calendar/Android.bp b/aconfig/trunk_staging/com.android.providers.calendar/Android.bp
deleted file mode 100644
index 06c30165..00000000
--- a/aconfig/trunk_staging/com.android.providers.calendar/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.providers.calendar-all",
-    package: "com.android.providers.calendar",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.providers.calendar/defer_post_initialize_work_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.calendar/defer_post_initialize_work_flag_values.textproto
deleted file mode 100644
index 0f7b7f27..00000000
--- a/aconfig/trunk_staging/com.android.providers.calendar/defer_post_initialize_work_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.calendar"
-  name: "defer_post_initialize_work"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.providers.contactkeys.flags/Android.bp b/aconfig/trunk_staging/com.android.providers.contactkeys.flags/Android.bp
deleted file mode 100644
index 57d99c45..00000000
--- a/aconfig/trunk_staging/com.android.providers.contactkeys.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.providers.contactkeys.flags-all",
-  package: "com.android.providers.contactkeys.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.providers.contactkeys.flags/contactkeys_strip_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.contactkeys.flags/contactkeys_strip_fix_flag_values.textproto
deleted file mode 100644
index d9f1b30c..00000000
--- a/aconfig/trunk_staging/com.android.providers.contactkeys.flags/contactkeys_strip_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.contactkeys.flags"
-  name: "contactkeys_strip_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.providers.contacts.flags/Android.bp b/aconfig/trunk_staging/com.android.providers.contacts.flags/Android.bp
deleted file mode 100644
index a25ae6d3..00000000
--- a/aconfig/trunk_staging/com.android.providers.contacts.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.providers.contacts.flags-all",
-    package: "com.android.providers.contacts.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.providers.contacts.flags/cp2_sync_search_index_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.contacts.flags/cp2_sync_search_index_flag_flag_values.textproto
deleted file mode 100644
index dd1fcb02..00000000
--- a/aconfig/trunk_staging/com.android.providers.contacts.flags/cp2_sync_search_index_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.contacts.flags"
-  name: "cp2_sync_search_index_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.providers.contacts.flags/log_call_method_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.contacts.flags/log_call_method_flag_values.textproto
deleted file mode 100644
index 82bb10db..00000000
--- a/aconfig/trunk_staging/com.android.providers.contacts.flags/log_call_method_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.contacts.flags"
-  name: "log_call_method"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.providers.contacts.flags/log_contact_save_invalid_account_error_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.contacts.flags/log_contact_save_invalid_account_error_flag_values.textproto
deleted file mode 100644
index 5450e317..00000000
--- a/aconfig/trunk_staging/com.android.providers.contacts.flags/log_contact_save_invalid_account_error_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.contacts.flags"
-  name: "log_contact_save_invalid_account_error"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.providers.downloads.flags/Android.bp b/aconfig/trunk_staging/com.android.providers.downloads.flags/Android.bp
deleted file mode 100644
index bf680444..00000000
--- a/aconfig/trunk_staging/com.android.providers.downloads.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.providers.downloads.flags-all",
-    package: "com.android.providers.downloads.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/Android.bp b/aconfig/trunk_staging/com.android.providers.media.flags/Android.bp
deleted file mode 100644
index 9c2236fc..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.providers.media.flags-all",
-    package: "com.android.providers.media.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/TEST_MAPPING b/aconfig/trunk_staging/com.android.providers.media.flags/TEST_MAPPING
deleted file mode 100644
index 3eeae762..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/TEST_MAPPING
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "imports": [
-    {
-      "path": "packages/providers/MediaProvider"
-    }
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/access_media_owner_package_name_permission_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/access_media_owner_package_name_permission_flag_values.textproto
deleted file mode 100644
index 62bf9fae..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/access_media_owner_package_name_permission_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "access_media_owner_package_name_permission"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/audio_sample_columns_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/audio_sample_columns_flag_values.textproto
deleted file mode 100644
index 14bf6f3a..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/audio_sample_columns_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "audio_sample_columns"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/cloud_media_provider_search_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/cloud_media_provider_search_flag_values.textproto
deleted file mode 100644
index c51a7450..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/cloud_media_provider_search_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "cloud_media_provider_search"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/enable_cloud_media_provider_capabilities_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/enable_cloud_media_provider_capabilities_flag_values.textproto
deleted file mode 100644
index f556c6ac..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/enable_cloud_media_provider_capabilities_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "enable_cloud_media_provider_capabilities"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/enable_embedded_photopicker_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/enable_embedded_photopicker_flag_values.textproto
deleted file mode 100644
index aff27074..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/enable_embedded_photopicker_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "enable_embedded_photopicker"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/enable_exclusion_list_for_default_folders_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/enable_exclusion_list_for_default_folders_flag_values.textproto
deleted file mode 100644
index 6c157e1c..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/enable_exclusion_list_for_default_folders_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "enable_exclusion_list_for_default_folders"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/enable_mark_is_favorite_status_api_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/enable_mark_is_favorite_status_api_flag_values.textproto
deleted file mode 100644
index e379cc9e..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/enable_mark_is_favorite_status_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "enable_mark_is_favorite_status_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/enable_mark_media_as_favorite_api_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/enable_mark_media_as_favorite_api_flag_values.textproto
deleted file mode 100644
index c5c051fd..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/enable_mark_media_as_favorite_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "enable_mark_media_as_favorite_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/enable_mime_type_fix_for_android_15_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/enable_mime_type_fix_for_android_15_flag_values.textproto
deleted file mode 100644
index 77caa7b2..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/enable_mime_type_fix_for_android_15_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "enable_mime_type_fix_for_android_15"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/enable_oem_metadata_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/enable_oem_metadata_flag_values.textproto
deleted file mode 100644
index 65bfd168..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/enable_oem_metadata_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "enable_oem_metadata"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/enable_oem_metadata_update_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/enable_oem_metadata_update_flag_values.textproto
deleted file mode 100644
index 16f7ac38..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/enable_oem_metadata_update_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "enable_oem_metadata_update"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/enable_photopicker_expressive_theme_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/enable_photopicker_expressive_theme_flag_values.textproto
deleted file mode 100644
index 60cdd893..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/enable_photopicker_expressive_theme_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "enable_photopicker_expressive_theme"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/enable_photopicker_search_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/enable_photopicker_search_flag_values.textproto
deleted file mode 100644
index 41fb87e0..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/enable_photopicker_search_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "enable_photopicker_search"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/enable_photopicker_transcoding_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/enable_photopicker_transcoding_flag_values.textproto
deleted file mode 100644
index c3d66090..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/enable_photopicker_transcoding_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "enable_photopicker_transcoding"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/enable_stable_uris_for_external_primary_volume_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/enable_stable_uris_for_external_primary_volume_flag_values.textproto
deleted file mode 100644
index f8749b11..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/enable_stable_uris_for_external_primary_volume_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "enable_stable_uris_for_external_primary_volume"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/enable_stable_uris_for_public_volume_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/enable_stable_uris_for_public_volume_flag_values.textproto
deleted file mode 100644
index 7cdf118c..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/enable_stable_uris_for_public_volume_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "enable_stable_uris_for_public_volume"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/enable_unicode_check_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/enable_unicode_check_flag_values.textproto
deleted file mode 100644
index 74b4b9af..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/enable_unicode_check_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "enable_unicode_check"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/inferred_media_date_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/inferred_media_date_flag_values.textproto
deleted file mode 100644
index 2332703e..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/inferred_media_date_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "inferred_media_date"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/media_cognition_service_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/media_cognition_service_flag_values.textproto
deleted file mode 100644
index e1bf01a1..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/media_cognition_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "media_cognition_service"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/media_store_open_file_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/media_store_open_file_flag_values.textproto
deleted file mode 100644
index 4cd68a14..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/media_store_open_file_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "media_store_open_file"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/motion_photo_intent_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/motion_photo_intent_flag_values.textproto
deleted file mode 100644
index d4fa294d..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/motion_photo_intent_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "motion_photo_intent"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/pick_ordered_images_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/pick_ordered_images_flag_values.textproto
deleted file mode 100644
index 85863466..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/pick_ordered_images_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "pick_ordered_images"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/picker_accent_color_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/picker_accent_color_flag_values.textproto
deleted file mode 100644
index aaf138ad..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/picker_accent_color_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "picker_accent_color"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/picker_default_tab_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/picker_default_tab_flag_values.textproto
deleted file mode 100644
index ff2d2b57..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/picker_default_tab_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "picker_default_tab"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/picker_pre_selection_extra_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/picker_pre_selection_extra_flag_values.textproto
deleted file mode 100644
index d5e8cbd7..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/picker_pre_selection_extra_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "picker_pre_selection_extra"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/picker_recent_selection_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/picker_recent_selection_flag_values.textproto
deleted file mode 100644
index 816e67ff..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/picker_recent_selection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "picker_recent_selection"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/revoke_access_owned_photos_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/revoke_access_owned_photos_flag_values.textproto
deleted file mode 100644
index 1458ac43..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/revoke_access_owned_photos_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "revoke_access_owned_photos"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/version_lockdown_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/version_lockdown_flag_values.textproto
deleted file mode 100644
index c0823297..00000000
--- a/aconfig/trunk_staging/com.android.providers.media.flags/version_lockdown_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.media.flags"
-  name: "version_lockdown"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.settings/Android.bp b/aconfig/trunk_staging/com.android.providers.settings/Android.bp
deleted file mode 100644
index 6fe4248d..00000000
--- a/aconfig/trunk_staging/com.android.providers.settings/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.providers.settings-all",
-    package: "com.android.providers.settings",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.providers.settings/disable_bulk_compare_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.settings/disable_bulk_compare_flag_values.textproto
deleted file mode 100644
index ebb5a236..00000000
--- a/aconfig/trunk_staging/com.android.providers.settings/disable_bulk_compare_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.settings"
-  name: "disable_bulk_compare"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.providers.settings/ignore_xml_for_read_only_flags_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.settings/ignore_xml_for_read_only_flags_flag_values.textproto
deleted file mode 100644
index a9ebaa5c..00000000
--- a/aconfig/trunk_staging/com.android.providers.settings/ignore_xml_for_read_only_flags_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.settings"
-  name: "ignore_xml_for_read_only_flags"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.settings/load_aconfig_defaults_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.settings/load_aconfig_defaults_flag_values.textproto
deleted file mode 100644
index a05654dc..00000000
--- a/aconfig/trunk_staging/com.android.providers.settings/load_aconfig_defaults_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.settings"
-  name: "load_aconfig_defaults"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.settings/load_apex_aconfig_protobufs_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.settings/load_apex_aconfig_protobufs_flag_values.textproto
deleted file mode 100644
index 18b5d58d..00000000
--- a/aconfig/trunk_staging/com.android.providers.settings/load_apex_aconfig_protobufs_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.settings"
-  name: "load_apex_aconfig_protobufs"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.settings/notify_individual_aconfig_sysprop_changed_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.settings/notify_individual_aconfig_sysprop_changed_flag_values.textproto
deleted file mode 100644
index a93cc016..00000000
--- a/aconfig/trunk_staging/com.android.providers.settings/notify_individual_aconfig_sysprop_changed_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.settings"
-  name: "notify_individual_aconfig_sysprop_changed"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.settings/stage_all_aconfig_flags_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.settings/stage_all_aconfig_flags_flag_values.textproto
deleted file mode 100644
index 075d9b0b..00000000
--- a/aconfig/trunk_staging/com.android.providers.settings/stage_all_aconfig_flags_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.settings"
-  name: "stage_all_aconfig_flags"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.providers.settings/support_local_overrides_sysprops_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.settings/support_local_overrides_sysprops_flag_values.textproto
deleted file mode 100644
index fa0d8d5a..00000000
--- a/aconfig/trunk_staging/com.android.providers.settings/support_local_overrides_sysprops_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.settings"
-  name: "support_local_overrides_sysprops"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.providers.settings/sync_local_overrides_removal_new_storage_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.settings/sync_local_overrides_removal_new_storage_flag_values.textproto
deleted file mode 100644
index 3eaa9e47..00000000
--- a/aconfig/trunk_staging/com.android.providers.settings/sync_local_overrides_removal_new_storage_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.settings"
-  name: "sync_local_overrides_removal_new_storage"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.ranging.flags/Android.bp b/aconfig/trunk_staging/com.android.ranging.flags/Android.bp
deleted file mode 100644
index 6eab856c..00000000
--- a/aconfig/trunk_staging/com.android.ranging.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.ranging.flags-all",
-    package: "com.android.ranging.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.ranging.flags/ranging_cs_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.ranging.flags/ranging_cs_enabled_flag_values.textproto
deleted file mode 100644
index 802f1c3c..00000000
--- a/aconfig/trunk_staging/com.android.ranging.flags/ranging_cs_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.ranging.flags"
-  name: "ranging_cs_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.ranging.flags/ranging_rtt_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.ranging.flags/ranging_rtt_enabled_flag_values.textproto
deleted file mode 100644
index 3b2d18a5..00000000
--- a/aconfig/trunk_staging/com.android.ranging.flags/ranging_rtt_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.ranging.flags"
-  name: "ranging_rtt_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.ranging.flags/ranging_stack_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.ranging.flags/ranging_stack_enabled_flag_values.textproto
deleted file mode 100644
index a09e2d67..00000000
--- a/aconfig/trunk_staging/com.android.ranging.flags/ranging_stack_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.ranging.flags"
-  name: "ranging_stack_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.sdksandbox.flags/Android.bp b/aconfig/trunk_staging/com.android.sdksandbox.flags/Android.bp
deleted file mode 100644
index 68248ad8..00000000
--- a/aconfig/trunk_staging/com.android.sdksandbox.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.sdksandbox.flags-all",
-    package: "com.android.sdksandbox.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.sdksandbox.flags/first_and_last_sdk_sandbox_uid_public_flag_values.textproto b/aconfig/trunk_staging/com.android.sdksandbox.flags/first_and_last_sdk_sandbox_uid_public_flag_values.textproto
deleted file mode 100644
index 35160989..00000000
--- a/aconfig/trunk_staging/com.android.sdksandbox.flags/first_and_last_sdk_sandbox_uid_public_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.sdksandbox.flags"
-  name: "first_and_last_sdk_sandbox_uid_public"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.sdksandbox.flags/sandbox_activity_sdk_based_context_flag_values.textproto b/aconfig/trunk_staging/com.android.sdksandbox.flags/sandbox_activity_sdk_based_context_flag_values.textproto
deleted file mode 100644
index 8d38274b..00000000
--- a/aconfig/trunk_staging/com.android.sdksandbox.flags/sandbox_activity_sdk_based_context_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.sdksandbox.flags"
-  name: "sandbox_activity_sdk_based_context"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.sdksandbox.flags/sandbox_client_importance_listener_flag_values.textproto b/aconfig/trunk_staging/com.android.sdksandbox.flags/sandbox_client_importance_listener_flag_values.textproto
deleted file mode 100644
index 08f2de00..00000000
--- a/aconfig/trunk_staging/com.android.sdksandbox.flags/sandbox_client_importance_listener_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.sdksandbox.flags"
-  name: "sandbox_client_importance_listener"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.sdksandbox.flags/sdk_sandbox_instrumentation_info_flag_values.textproto b/aconfig/trunk_staging/com.android.sdksandbox.flags/sdk_sandbox_instrumentation_info_flag_values.textproto
deleted file mode 100644
index 625e88d7..00000000
--- a/aconfig/trunk_staging/com.android.sdksandbox.flags/sdk_sandbox_instrumentation_info_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.sdksandbox.flags"
-  name: "sdk_sandbox_instrumentation_info"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.sdksandbox.flags/sdk_sandbox_uid_to_app_uid_api_flag_values.textproto b/aconfig/trunk_staging/com.android.sdksandbox.flags/sdk_sandbox_uid_to_app_uid_api_flag_values.textproto
deleted file mode 100644
index 87b6cf61..00000000
--- a/aconfig/trunk_staging/com.android.sdksandbox.flags/sdk_sandbox_uid_to_app_uid_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.sdksandbox.flags"
-  name: "sdk_sandbox_uid_to_app_uid_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.sdksandbox.flags/sdk_sandbox_verify_sdk_dex_files_flag_values.textproto b/aconfig/trunk_staging/com.android.sdksandbox.flags/sdk_sandbox_verify_sdk_dex_files_flag_values.textproto
deleted file mode 100644
index 79ec62af..00000000
--- a/aconfig/trunk_staging/com.android.sdksandbox.flags/sdk_sandbox_verify_sdk_dex_files_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.sdksandbox.flags"
-  name: "sdk_sandbox_verify_sdk_dex_files"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.sdksandbox.flags/selinux_input_selector_flag_values.textproto b/aconfig/trunk_staging/com.android.sdksandbox.flags/selinux_input_selector_flag_values.textproto
deleted file mode 100644
index 89fed10d..00000000
--- a/aconfig/trunk_staging/com.android.sdksandbox.flags/selinux_input_selector_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.sdksandbox.flags"
-  name: "selinux_input_selector"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.sdksandbox.flags/selinux_sdk_sandbox_audit_flag_values.textproto b/aconfig/trunk_staging/com.android.sdksandbox.flags/selinux_sdk_sandbox_audit_flag_values.textproto
deleted file mode 100644
index d6f10232..00000000
--- a/aconfig/trunk_staging/com.android.sdksandbox.flags/selinux_sdk_sandbox_audit_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.sdksandbox.flags"
-  name: "selinux_sdk_sandbox_audit"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.sdksandbox.flags/service_restriction_package_name_logic_updated_flag_values.textproto b/aconfig/trunk_staging/com.android.sdksandbox.flags/service_restriction_package_name_logic_updated_flag_values.textproto
deleted file mode 100644
index 7569db93..00000000
--- a/aconfig/trunk_staging/com.android.sdksandbox.flags/service_restriction_package_name_logic_updated_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.sdksandbox.flags"
-  name: "service_restriction_package_name_logic_updated"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/Android.bp b/aconfig/trunk_staging/com.android.server.accessibility/Android.bp
deleted file mode 100644
index eb6a0937..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.accessibility-all",
-    package: "com.android.server.accessibility",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/TEST_MAPPING b/aconfig/trunk_staging/com.android.server.accessibility/TEST_MAPPING
deleted file mode 100644
index e1115242..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/TEST_MAPPING
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "imports": [
-    {
-      "path": "frameworks/base/services/accessibility/TEST_MAPPING"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/add_window_token_without_lock_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/add_window_token_without_lock_flag_values.textproto
deleted file mode 100644
index f3a06596..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/add_window_token_without_lock_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "add_window_token_without_lock"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/allow_secure_screenshots_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/allow_secure_screenshots_flag_values.textproto
deleted file mode 100644
index c54f4045..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/allow_secure_screenshots_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "allow_secure_screenshots"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/always_allow_observing_touch_events_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/always_allow_observing_touch_events_flag_values.textproto
deleted file mode 100644
index 99192a52..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/always_allow_observing_touch_events_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "always_allow_observing_touch_events"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/cleanup_a11y_overlays_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/cleanup_a11y_overlays_flag_values.textproto
deleted file mode 100644
index eb1f4912..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/cleanup_a11y_overlays_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "cleanup_a11y_overlays"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/clear_default_from_a11y_shortcut_target_service_restore_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/clear_default_from_a11y_shortcut_target_service_restore_flag_values.textproto
deleted file mode 100644
index c6ac0bc7..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/clear_default_from_a11y_shortcut_target_service_restore_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "clear_default_from_a11y_shortcut_target_service_restore"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/clear_shortcuts_when_activity_updates_to_service_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/clear_shortcuts_when_activity_updates_to_service_flag_values.textproto
deleted file mode 100644
index 753967e3..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/clear_shortcuts_when_activity_updates_to_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "clear_shortcuts_when_activity_updates_to_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/compute_window_changes_on_a11y_v2_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/compute_window_changes_on_a11y_v2_flag_values.textproto
deleted file mode 100644
index dd363eb1..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/compute_window_changes_on_a11y_v2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "compute_window_changes_on_a11y_v2"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/deprecate_package_list_observer_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/deprecate_package_list_observer_flag_values.textproto
deleted file mode 100644
index 40e4f19b..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/deprecate_package_list_observer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "deprecate_package_list_observer"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/disable_continuous_shortcut_on_force_stop_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/disable_continuous_shortcut_on_force_stop_flag_values.textproto
deleted file mode 100644
index fbb8aee8..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/disable_continuous_shortcut_on_force_stop_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "disable_continuous_shortcut_on_force_stop"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/do_not_reset_key_event_state_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/do_not_reset_key_event_state_flag_values.textproto
deleted file mode 100644
index c90a95a0..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/do_not_reset_key_event_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "do_not_reset_key_event_state"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/enable_color_correction_saturation_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/enable_color_correction_saturation_flag_values.textproto
deleted file mode 100644
index 64b53bad..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/enable_color_correction_saturation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "enable_color_correction_saturation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/enable_hardware_shortcut_disables_warning_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/enable_hardware_shortcut_disables_warning_flag_values.textproto
deleted file mode 100644
index 44ae0651..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/enable_hardware_shortcut_disables_warning_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "enable_hardware_shortcut_disables_warning"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/enable_magnification_follows_mouse_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/enable_magnification_follows_mouse_bugfix_flag_values.textproto
deleted file mode 100644
index 36d2108c..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/enable_magnification_follows_mouse_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "enable_magnification_follows_mouse_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/enable_magnification_keyboard_control_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/enable_magnification_keyboard_control_flag_values.textproto
deleted file mode 100644
index e7bdca11..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/enable_magnification_keyboard_control_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "enable_magnification_keyboard_control"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/enable_magnification_multiple_finger_multiple_tap_gesture_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/enable_magnification_multiple_finger_multiple_tap_gesture_flag_values.textproto
deleted file mode 100644
index 581c8785..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/enable_magnification_multiple_finger_multiple_tap_gesture_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "enable_magnification_multiple_finger_multiple_tap_gesture"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/event_dispatcher_raw_event_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/event_dispatcher_raw_event_flag_values.textproto
deleted file mode 100644
index 67e255bd..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/event_dispatcher_raw_event_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "event_dispatcher_raw_event"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/fix_drag_pointer_when_ending_drag_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/fix_drag_pointer_when_ending_drag_flag_values.textproto
deleted file mode 100644
index 7576cf2d..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/fix_drag_pointer_when_ending_drag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "fix_drag_pointer_when_ending_drag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/focus_click_point_window_bounds_from_a11y_window_info_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/focus_click_point_window_bounds_from_a11y_window_info_flag_values.textproto
deleted file mode 100644
index f82d3b77..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/focus_click_point_window_bounds_from_a11y_window_info_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "focus_click_point_window_bounds_from_a11y_window_info"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/fullscreen_fling_gesture_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/fullscreen_fling_gesture_flag_values.textproto
deleted file mode 100644
index a394158e..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/fullscreen_fling_gesture_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "fullscreen_fling_gesture"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/handle_multi_device_input_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/handle_multi_device_input_flag_values.textproto
deleted file mode 100644
index cd8c9165..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/handle_multi_device_input_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "handle_multi_device_input"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/hearing_input_change_when_comm_device_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/hearing_input_change_when_comm_device_flag_values.textproto
deleted file mode 100644
index 7b92b85f..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/hearing_input_change_when_comm_device_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "hearing_input_change_when_comm_device"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/magnification_enlarge_pointer_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/magnification_enlarge_pointer_bugfix_flag_values.textproto
deleted file mode 100644
index d141e6a6..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/magnification_enlarge_pointer_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "magnification_enlarge_pointer_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/manager_avoid_receiver_timeout_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/manager_avoid_receiver_timeout_flag_values.textproto
deleted file mode 100644
index 6c85a435..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/manager_avoid_receiver_timeout_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "manager_avoid_receiver_timeout"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/manager_package_monitor_logic_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/manager_package_monitor_logic_fix_flag_values.textproto
deleted file mode 100644
index e983fd0e..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/manager_package_monitor_logic_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "manager_package_monitor_logic_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/motion_event_injector_cancel_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/motion_event_injector_cancel_fix_flag_values.textproto
deleted file mode 100644
index 60f5d7f4..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/motion_event_injector_cancel_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "motion_event_injector_cancel_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/package_monitor_dedicated_thread_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/package_monitor_dedicated_thread_flag_values.textproto
deleted file mode 100644
index 29f91666..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/package_monitor_dedicated_thread_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "package_monitor_dedicated_thread"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/pinch_zoom_zero_min_span_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/pinch_zoom_zero_min_span_flag_values.textproto
deleted file mode 100644
index b4724fb7..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/pinch_zoom_zero_min_span_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "pinch_zoom_zero_min_span"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/proxy_use_apps_on_virtual_device_listener_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/proxy_use_apps_on_virtual_device_listener_flag_values.textproto
deleted file mode 100644
index 871b41c0..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/proxy_use_apps_on_virtual_device_listener_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "proxy_use_apps_on_virtual_device_listener"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/reset_hover_event_timer_on_action_up_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/reset_hover_event_timer_on_action_up_flag_values.textproto
deleted file mode 100644
index f4417f33..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/reset_hover_event_timer_on_action_up_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "reset_hover_event_timer_on_action_up"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/resettable_dynamic_properties_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/resettable_dynamic_properties_flag_values.textproto
deleted file mode 100644
index f00d59b5..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/resettable_dynamic_properties_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "resettable_dynamic_properties"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/scan_packages_without_lock_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/scan_packages_without_lock_flag_values.textproto
deleted file mode 100644
index 48014856..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/scan_packages_without_lock_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "scan_packages_without_lock"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/send_hover_events_based_on_event_stream_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/send_hover_events_based_on_event_stream_flag_values.textproto
deleted file mode 100644
index 3b09faa2..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/send_hover_events_based_on_event_stream_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "send_hover_events_based_on_event_stream"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/skip_package_change_before_user_switch_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/skip_package_change_before_user_switch_flag_values.textproto
deleted file mode 100644
index 379e8efb..00000000
--- a/aconfig/trunk_staging/com.android.server.accessibility/skip_package_change_before_user_switch_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.accessibility"
-  name: "skip_package_change_before_user_switch"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.alarm/Android.bp b/aconfig/trunk_staging/com.android.server.alarm/Android.bp
deleted file mode 100644
index 09ad8120..00000000
--- a/aconfig/trunk_staging/com.android.server.alarm/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.alarm-all",
-    package: "com.android.server.alarm",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.server.alarm/TEST_MAPPING b/aconfig/trunk_staging/com.android.server.alarm/TEST_MAPPING
deleted file mode 100644
index 990ede40..00000000
--- a/aconfig/trunk_staging/com.android.server.alarm/TEST_MAPPING
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "imports": [
-    {
-      "path": "frameworks/base/apex/jobscheduler/service/java/com/android/server/alarm"
-    }
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.server.alarm/acquire_wakelock_before_send_flag_values.textproto b/aconfig/trunk_staging/com.android.server.alarm/acquire_wakelock_before_send_flag_values.textproto
deleted file mode 100644
index 6cde68f2..00000000
--- a/aconfig/trunk_staging/com.android.server.alarm/acquire_wakelock_before_send_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.alarm"
-  name: "acquire_wakelock_before_send"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.alarm/start_user_before_scheduled_alarms_flag_values.textproto b/aconfig/trunk_staging/com.android.server.alarm/start_user_before_scheduled_alarms_flag_values.textproto
deleted file mode 100644
index bf2fbd37..00000000
--- a/aconfig/trunk_staging/com.android.server.alarm/start_user_before_scheduled_alarms_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.alarm"
-  name: "start_user_before_scheduled_alarms"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.alarm/use_frozen_state_to_drop_listener_alarms_flag_values.textproto b/aconfig/trunk_staging/com.android.server.alarm/use_frozen_state_to_drop_listener_alarms_flag_values.textproto
deleted file mode 100644
index 1fc320ec..00000000
--- a/aconfig/trunk_staging/com.android.server.alarm/use_frozen_state_to_drop_listener_alarms_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.alarm"
-  name: "use_frozen_state_to_drop_listener_alarms"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/Android.bp b/aconfig/trunk_staging/com.android.server.am/Android.bp
deleted file mode 100644
index 1c19575b..00000000
--- a/aconfig/trunk_staging/com.android.server.am/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.am-all",
-    package: "com.android.server.am",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/TEST_MAPPING b/aconfig/trunk_staging/com.android.server.am/TEST_MAPPING
deleted file mode 100644
index ea347143..00000000
--- a/aconfig/trunk_staging/com.android.server.am/TEST_MAPPING
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "imports": [
-    {
-      "path": "frameworks/base/services/core/java/com/android/server/am"
-    }
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/add_modify_raw_oom_adj_service_level_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/add_modify_raw_oom_adj_service_level_flag_values.textproto
deleted file mode 100644
index 359469e0..00000000
--- a/aconfig/trunk_staging/com.android.server.am/add_modify_raw_oom_adj_service_level_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "add_modify_raw_oom_adj_service_level"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/app_start_info_isolated_process_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/app_start_info_isolated_process_flag_values.textproto
deleted file mode 100644
index a128a65d..00000000
--- a/aconfig/trunk_staging/com.android.server.am/app_start_info_isolated_process_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "app_start_info_isolated_process"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/avoid_note_op_at_enqueue_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/avoid_note_op_at_enqueue_flag_values.textproto
deleted file mode 100644
index 3bec7d03..00000000
--- a/aconfig/trunk_staging/com.android.server.am/avoid_note_op_at_enqueue_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "avoid_note_op_at_enqueue"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/avoid_repeated_bcast_re_enqueues_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/avoid_repeated_bcast_re_enqueues_flag_values.textproto
deleted file mode 100644
index f59fec59..00000000
--- a/aconfig/trunk_staging/com.android.server.am/avoid_repeated_bcast_re_enqueues_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "avoid_repeated_bcast_re_enqueues"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/avoid_resolving_type_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/avoid_resolving_type_flag_values.textproto
deleted file mode 100644
index 4898743f..00000000
--- a/aconfig/trunk_staging/com.android.server.am/avoid_resolving_type_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "avoid_resolving_type"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/batching_oom_adj_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/batching_oom_adj_flag_values.textproto
deleted file mode 100644
index 1b249c01..00000000
--- a/aconfig/trunk_staging/com.android.server.am/batching_oom_adj_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "batching_oom_adj"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/collect_logcat_on_run_synchronously_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/collect_logcat_on_run_synchronously_flag_values.textproto
deleted file mode 100644
index 1d571a13..00000000
--- a/aconfig/trunk_staging/com.android.server.am/collect_logcat_on_run_synchronously_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "collect_logcat_on_run_synchronously"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/defer_binders_when_paused_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/defer_binders_when_paused_flag_values.textproto
deleted file mode 100644
index e47d2c0a..00000000
--- a/aconfig/trunk_staging/com.android.server.am/defer_binders_when_paused_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "defer_binders_when_paused"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/defer_display_events_when_frozen_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/defer_display_events_when_frozen_flag_values.textproto
deleted file mode 100644
index c2c69f40..00000000
--- a/aconfig/trunk_staging/com.android.server.am/defer_display_events_when_frozen_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "defer_display_events_when_frozen"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/enable_dropbox_watchdog_headers_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/enable_dropbox_watchdog_headers_flag_values.textproto
deleted file mode 100644
index 2b583500..00000000
--- a/aconfig/trunk_staging/com.android.server.am/enable_dropbox_watchdog_headers_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "enable_dropbox_watchdog_headers"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/fgs_boot_completed_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/fgs_boot_completed_flag_values.textproto
deleted file mode 100644
index 24ac5f76..00000000
--- a/aconfig/trunk_staging/com.android.server.am/fgs_boot_completed_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "fgs_boot_completed"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/fgs_disable_saw_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/fgs_disable_saw_flag_values.textproto
deleted file mode 100644
index 874d0f9c..00000000
--- a/aconfig/trunk_staging/com.android.server.am/fgs_disable_saw_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "fgs_disable_saw"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/follow_up_oomadj_updates_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/follow_up_oomadj_updates_flag_values.textproto
deleted file mode 100644
index 61a12ee0..00000000
--- a/aconfig/trunk_staging/com.android.server.am/follow_up_oomadj_updates_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "follow_up_oomadj_updates"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/limit_priority_scope_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/limit_priority_scope_flag_values.textproto
deleted file mode 100644
index d979600c..00000000
--- a/aconfig/trunk_staging/com.android.server.am/limit_priority_scope_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "limit_priority_scope"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/log_broadcast_processed_event_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/log_broadcast_processed_event_flag_values.textproto
deleted file mode 100644
index 540daf1e..00000000
--- a/aconfig/trunk_staging/com.android.server.am/log_broadcast_processed_event_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "log_broadcast_processed_event"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/log_broadcast_sent_event_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/log_broadcast_sent_event_flag_values.textproto
deleted file mode 100644
index 3caa8dfb..00000000
--- a/aconfig/trunk_staging/com.android.server.am/log_broadcast_sent_event_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "log_broadcast_sent_event"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/log_excessive_binder_proxies_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/log_excessive_binder_proxies_flag_values.textproto
deleted file mode 100644
index a7af38ff..00000000
--- a/aconfig/trunk_staging/com.android.server.am/log_excessive_binder_proxies_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "log_excessive_binder_proxies"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/logcat_longer_timeout_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/logcat_longer_timeout_flag_values.textproto
deleted file mode 100644
index 93857ddd..00000000
--- a/aconfig/trunk_staging/com.android.server.am/logcat_longer_timeout_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "logcat_longer_timeout"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/lower_sms_oom_importance_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/lower_sms_oom_importance_flag_values.textproto
deleted file mode 100644
index 3d73c594..00000000
--- a/aconfig/trunk_staging/com.android.server.am/lower_sms_oom_importance_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "lower_sms_oom_importance"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/migrate_full_oomadj_updates_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/migrate_full_oomadj_updates_flag_values.textproto
deleted file mode 100644
index 0f0d88fd..00000000
--- a/aconfig/trunk_staging/com.android.server.am/migrate_full_oomadj_updates_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "migrate_full_oomadj_updates"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/new_fgs_restriction_logic_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/new_fgs_restriction_logic_flag_values.textproto
deleted file mode 100644
index 0d30b0a8..00000000
--- a/aconfig/trunk_staging/com.android.server.am/new_fgs_restriction_logic_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "new_fgs_restriction_logic"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/oomadjuster_correctness_rewrite_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/oomadjuster_correctness_rewrite_flag_values.textproto
deleted file mode 100644
index b30d11a9..00000000
--- a/aconfig/trunk_staging/com.android.server.am/oomadjuster_correctness_rewrite_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "oomadjuster_correctness_rewrite"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/phantom_processes_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/phantom_processes_fix_flag_values.textproto
deleted file mode 100644
index 25938a7d..00000000
--- a/aconfig/trunk_staging/com.android.server.am/phantom_processes_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "phantom_processes_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/raise_bound_ui_service_threshold_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/raise_bound_ui_service_threshold_flag_values.textproto
deleted file mode 100644
index 1994e24f..00000000
--- a/aconfig/trunk_staging/com.android.server.am/raise_bound_ui_service_threshold_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "raise_bound_ui_service_threshold"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/restrict_priority_values_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/restrict_priority_values_flag_values.textproto
deleted file mode 100644
index 1cbd0fbe..00000000
--- a/aconfig/trunk_staging/com.android.server.am/restrict_priority_values_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "restrict_priority_values"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/service_binding_oom_adj_policy_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/service_binding_oom_adj_policy_flag_values.textproto
deleted file mode 100644
index 2d55a219..00000000
--- a/aconfig/trunk_staging/com.android.server.am/service_binding_oom_adj_policy_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "service_binding_oom_adj_policy"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/simplify_process_traversal_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/simplify_process_traversal_flag_values.textproto
deleted file mode 100644
index adae7510..00000000
--- a/aconfig/trunk_staging/com.android.server.am/simplify_process_traversal_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "simplify_process_traversal"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/trace_receiver_registration_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/trace_receiver_registration_flag_values.textproto
deleted file mode 100644
index 1e886bd6..00000000
--- a/aconfig/trunk_staging/com.android.server.am/trace_receiver_registration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "trace_receiver_registration"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/trace_update_app_freeze_state_lsp_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/trace_update_app_freeze_state_lsp_flag_values.textproto
deleted file mode 100644
index 9e2f2b57..00000000
--- a/aconfig/trunk_staging/com.android.server.am/trace_update_app_freeze_state_lsp_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "trace_update_app_freeze_state_lsp"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/unfreeze_bind_policy_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/unfreeze_bind_policy_fix_flag_values.textproto
deleted file mode 100644
index 551393dc..00000000
--- a/aconfig/trunk_staging/com.android.server.am/unfreeze_bind_policy_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "unfreeze_bind_policy_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/use_cpu_time_capability_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/use_cpu_time_capability_flag_values.textproto
deleted file mode 100644
index 157995b1..00000000
--- a/aconfig/trunk_staging/com.android.server.am/use_cpu_time_capability_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "use_cpu_time_capability"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/use_permission_manager_for_broadcast_delivery_check_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/use_permission_manager_for_broadcast_delivery_check_flag_values.textproto
deleted file mode 100644
index 7e8d08d6..00000000
--- a/aconfig/trunk_staging/com.android.server.am/use_permission_manager_for_broadcast_delivery_check_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "use_permission_manager_for_broadcast_delivery_check"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.backup/Android.bp b/aconfig/trunk_staging/com.android.server.backup/Android.bp
deleted file mode 100644
index 38e8ecbf..00000000
--- a/aconfig/trunk_staging/com.android.server.backup/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.backup-all",
-    package: "com.android.server.backup",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.server.backup/enable_clear_pipe_after_restore_file_flag_values.textproto b/aconfig/trunk_staging/com.android.server.backup/enable_clear_pipe_after_restore_file_flag_values.textproto
deleted file mode 100644
index ce087dde..00000000
--- a/aconfig/trunk_staging/com.android.server.backup/enable_clear_pipe_after_restore_file_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.backup"
-  name: "enable_clear_pipe_after_restore_file"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.backup/enable_increase_datatypes_for_agent_logging_flag_values.textproto b/aconfig/trunk_staging/com.android.server.backup/enable_increase_datatypes_for_agent_logging_flag_values.textproto
deleted file mode 100644
index fb781ad3..00000000
--- a/aconfig/trunk_staging/com.android.server.backup/enable_increase_datatypes_for_agent_logging_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.backup"
-  name: "enable_increase_datatypes_for_agent_logging"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.backup/enable_max_size_writes_to_pipes_flag_values.textproto b/aconfig/trunk_staging/com.android.server.backup/enable_max_size_writes_to_pipes_flag_values.textproto
deleted file mode 100644
index 20f33b9e..00000000
--- a/aconfig/trunk_staging/com.android.server.backup/enable_max_size_writes_to_pipes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.backup"
-  name: "enable_max_size_writes_to_pipes"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.backup/enable_metrics_settings_backup_agents_flag_values.textproto b/aconfig/trunk_staging/com.android.server.backup/enable_metrics_settings_backup_agents_flag_values.textproto
deleted file mode 100644
index 74889e22..00000000
--- a/aconfig/trunk_staging/com.android.server.backup/enable_metrics_settings_backup_agents_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.backup"
-  name: "enable_metrics_settings_backup_agents"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.backup/enable_metrics_system_backup_agents_flag_values.textproto b/aconfig/trunk_staging/com.android.server.backup/enable_metrics_system_backup_agents_flag_values.textproto
deleted file mode 100644
index ed398ca6..00000000
--- a/aconfig/trunk_staging/com.android.server.backup/enable_metrics_system_backup_agents_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.backup"
-  name: "enable_metrics_system_backup_agents"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.backup/enable_restricted_mode_changes_flag_values.textproto b/aconfig/trunk_staging/com.android.server.backup/enable_restricted_mode_changes_flag_values.textproto
deleted file mode 100644
index 53142136..00000000
--- a/aconfig/trunk_staging/com.android.server.backup/enable_restricted_mode_changes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.backup"
-  name: "enable_restricted_mode_changes"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.backup/enable_v_to_u_restore_for_system_components_in_allowlist_flag_values.textproto b/aconfig/trunk_staging/com.android.server.backup/enable_v_to_u_restore_for_system_components_in_allowlist_flag_values.textproto
deleted file mode 100644
index bbe54c83..00000000
--- a/aconfig/trunk_staging/com.android.server.backup/enable_v_to_u_restore_for_system_components_in_allowlist_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.backup"
-  name: "enable_v_to_u_restore_for_system_components_in_allowlist"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.biometrics/Android.bp b/aconfig/trunk_staging/com.android.server.biometrics/Android.bp
deleted file mode 100644
index 5424806d..00000000
--- a/aconfig/trunk_staging/com.android.server.biometrics/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.biometrics-all",
-    package: "com.android.server.biometrics",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.server.biometrics/face_vhal_feature_flag_values.textproto b/aconfig/trunk_staging/com.android.server.biometrics/face_vhal_feature_flag_values.textproto
deleted file mode 100644
index 0380459d..00000000
--- a/aconfig/trunk_staging/com.android.server.biometrics/face_vhal_feature_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.biometrics"
-  name: "face_vhal_feature"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.biometrics/frr_dialog_improvement_flag_values.textproto b/aconfig/trunk_staging/com.android.server.biometrics/frr_dialog_improvement_flag_values.textproto
deleted file mode 100644
index 47a9003a..00000000
--- a/aconfig/trunk_staging/com.android.server.biometrics/frr_dialog_improvement_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.biometrics"
-  name: "frr_dialog_improvement"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.biometrics/notify_fingerprints_loe_flag_values.textproto b/aconfig/trunk_staging/com.android.server.biometrics/notify_fingerprints_loe_flag_values.textproto
deleted file mode 100644
index 38baa819..00000000
--- a/aconfig/trunk_staging/com.android.server.biometrics/notify_fingerprints_loe_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.biometrics"
-  name: "notify_fingerprints_loe"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.biometrics/set_ignore_speed_up_flag_values.textproto b/aconfig/trunk_staging/com.android.server.biometrics/set_ignore_speed_up_flag_values.textproto
deleted file mode 100644
index 028a1e2f..00000000
--- a/aconfig/trunk_staging/com.android.server.biometrics/set_ignore_speed_up_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.biometrics"
-  name: "set_ignore_speed_up"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.companion.virtual/Android.bp b/aconfig/trunk_staging/com.android.server.companion.virtual/Android.bp
deleted file mode 100644
index 48162597..00000000
--- a/aconfig/trunk_staging/com.android.server.companion.virtual/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.companion.virtual-all",
-  package: "com.android.server.companion.virtual",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.server.companion.virtual/dump_history_flag_values.textproto b/aconfig/trunk_staging/com.android.server.companion.virtual/dump_history_flag_values.textproto
deleted file mode 100644
index 46798015..00000000
--- a/aconfig/trunk_staging/com.android.server.companion.virtual/dump_history_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.companion.virtual"
-  name: "dump_history"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.compat/Android.bp b/aconfig/trunk_staging/com.android.server.compat/Android.bp
deleted file mode 100644
index f34b7264..00000000
--- a/aconfig/trunk_staging/com.android.server.compat/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.compat-all",
-    package: "com.android.server.compat",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.server.compat/system_uid_target_system_sdk_flag_values.textproto b/aconfig/trunk_staging/com.android.server.compat/system_uid_target_system_sdk_flag_values.textproto
deleted file mode 100644
index f4ea13df..00000000
--- a/aconfig/trunk_staging/com.android.server.compat/system_uid_target_system_sdk_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.compat"
-  name: "system_uid_target_system_sdk"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.connectivity/Android.bp b/aconfig/trunk_staging/com.android.server.connectivity/Android.bp
deleted file mode 100644
index 75b6c758..00000000
--- a/aconfig/trunk_staging/com.android.server.connectivity/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.connectivity-all",
-  package: "com.android.server.connectivity",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.server.contextualsearch.flags/Android.bp b/aconfig/trunk_staging/com.android.server.contextualsearch.flags/Android.bp
deleted file mode 100644
index 20aa26a8..00000000
--- a/aconfig/trunk_staging/com.android.server.contextualsearch.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.contextualsearch.flags-all",
-  package: "com.android.server.contextualsearch.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.server.deviceconfig/Android.bp b/aconfig/trunk_staging/com.android.server.deviceconfig/Android.bp
deleted file mode 100644
index f3a9ac74..00000000
--- a/aconfig/trunk_staging/com.android.server.deviceconfig/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.deviceconfig-all",
-  package: "com.android.server.deviceconfig",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.server.deviceconfig/enable_charger_dependency_for_reboot_flag_values.textproto b/aconfig/trunk_staging/com.android.server.deviceconfig/enable_charger_dependency_for_reboot_flag_values.textproto
deleted file mode 100644
index 981c1f01..00000000
--- a/aconfig/trunk_staging/com.android.server.deviceconfig/enable_charger_dependency_for_reboot_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.deviceconfig"
-  name: "enable_charger_dependency_for_reboot"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.deviceconfig/enable_custom_reboot_time_configurations_flag_values.textproto b/aconfig/trunk_staging/com.android.server.deviceconfig/enable_custom_reboot_time_configurations_flag_values.textproto
deleted file mode 100644
index 6665f602..00000000
--- a/aconfig/trunk_staging/com.android.server.deviceconfig/enable_custom_reboot_time_configurations_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.deviceconfig"
-  name: "enable_custom_reboot_time_configurations"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.deviceconfig/enable_reboot_notification_flag_values.textproto b/aconfig/trunk_staging/com.android.server.deviceconfig/enable_reboot_notification_flag_values.textproto
deleted file mode 100644
index 69156b4d..00000000
--- a/aconfig/trunk_staging/com.android.server.deviceconfig/enable_reboot_notification_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.deviceconfig"
-  name: "enable_reboot_notification"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.deviceconfig/enable_sim_pin_replay_flag_values.textproto b/aconfig/trunk_staging/com.android.server.deviceconfig/enable_sim_pin_replay_flag_values.textproto
deleted file mode 100644
index f688f548..00000000
--- a/aconfig/trunk_staging/com.android.server.deviceconfig/enable_sim_pin_replay_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.deviceconfig"
-  name: "enable_sim_pin_replay"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.deviceconfig/enable_unattended_reboot_flag_values.textproto b/aconfig/trunk_staging/com.android.server.deviceconfig/enable_unattended_reboot_flag_values.textproto
deleted file mode 100644
index c26d7e7e..00000000
--- a/aconfig/trunk_staging/com.android.server.deviceconfig/enable_unattended_reboot_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.deviceconfig"
-  name: "enable_unattended_reboot"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.deviceconfig/fix_flag_staging_notification_resource_fetching_flag_values.textproto b/aconfig/trunk_staging/com.android.server.deviceconfig/fix_flag_staging_notification_resource_fetching_flag_values.textproto
deleted file mode 100644
index 4d37c41a..00000000
--- a/aconfig/trunk_staging/com.android.server.deviceconfig/fix_flag_staging_notification_resource_fetching_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.deviceconfig"
-  name: "fix_flag_staging_notification_resource_fetching"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.deviceidle/Android.bp b/aconfig/trunk_staging/com.android.server.deviceidle/Android.bp
deleted file mode 100644
index 3d9f1171..00000000
--- a/aconfig/trunk_staging/com.android.server.deviceidle/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.deviceidle-all",
-    package: "com.android.server.deviceidle",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.server.deviceidle/remove_idle_location_flag_values.textproto b/aconfig/trunk_staging/com.android.server.deviceidle/remove_idle_location_flag_values.textproto
deleted file mode 100644
index 9e478b18..00000000
--- a/aconfig/trunk_staging/com.android.server.deviceidle/remove_idle_location_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.deviceidle"
-  name: "remove_idle_location"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.deviceidle/use_cpu_time_for_temp_allowlist_flag_values.textproto b/aconfig/trunk_staging/com.android.server.deviceidle/use_cpu_time_for_temp_allowlist_flag_values.textproto
deleted file mode 100644
index d83cf697..00000000
--- a/aconfig/trunk_staging/com.android.server.deviceidle/use_cpu_time_for_temp_allowlist_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.deviceidle"
-  name: "use_cpu_time_for_temp_allowlist"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.devicepolicy.flags/Android.bp b/aconfig/trunk_staging/com.android.server.devicepolicy.flags/Android.bp
deleted file mode 100644
index 4d2419e7..00000000
--- a/aconfig/trunk_staging/com.android.server.devicepolicy.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.devicepolicy.flags-all",
-  package: "com.android.server.devicepolicy.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/Android.bp b/aconfig/trunk_staging/com.android.server.display.feature.flags/Android.bp
deleted file mode 100644
index accc503d..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.display.feature.flags-all",
-    package: "com.android.server.display.feature.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/TEST_MAPPING b/aconfig/trunk_staging/com.android.server.display.feature.flags/TEST_MAPPING
deleted file mode 100644
index 477860d3..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/TEST_MAPPING
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "imports": [
-    {
-      "path": "frameworks/base/services/core/java/com/android/server/display"
-    }
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/always_rotate_display_device_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/always_rotate_display_device_flag_values.textproto
deleted file mode 100644
index 650326a6..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/always_rotate_display_device_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "always_rotate_display_device"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/auto_brightness_mode_bedtime_wear_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/auto_brightness_mode_bedtime_wear_flag_values.textproto
deleted file mode 100644
index 4461742e..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/auto_brightness_mode_bedtime_wear_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "auto_brightness_mode_bedtime_wear"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/auto_brightness_modes_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/auto_brightness_modes_flag_values.textproto
deleted file mode 100644
index d530b28d..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/auto_brightness_modes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "auto_brightness_modes"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/back_up_smooth_display_and_force_peak_refresh_rate_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/back_up_smooth_display_and_force_peak_refresh_rate_flag_values.textproto
deleted file mode 100644
index ed46e7ce..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/back_up_smooth_display_and_force_peak_refresh_rate_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "back_up_smooth_display_and_force_peak_refresh_rate"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/base_density_for_external_displays_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/base_density_for_external_displays_flag_values.textproto
deleted file mode 100644
index f0bfcfbb..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/base_density_for_external_displays_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "base_density_for_external_displays"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/block_autobrightness_changes_on_stylus_usage_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/block_autobrightness_changes_on_stylus_usage_flag_values.textproto
deleted file mode 100644
index edaeb2e3..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/block_autobrightness_changes_on_stylus_usage_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "block_autobrightness_changes_on_stylus_usage"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/brightness_wear_bedtime_mode_clamper_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/brightness_wear_bedtime_mode_clamper_flag_values.textproto
deleted file mode 100644
index ac0dbd89..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/brightness_wear_bedtime_mode_clamper_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "brightness_wear_bedtime_mode_clamper"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/committed_state_separate_event_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/committed_state_separate_event_flag_values.textproto
deleted file mode 100644
index b09c76eb..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/committed_state_separate_event_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "committed_state_separate_event"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/delay_implicit_rr_registration_until_rr_accessed_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/delay_implicit_rr_registration_until_rr_accessed_flag_values.textproto
deleted file mode 100644
index 834032cd..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/delay_implicit_rr_registration_until_rr_accessed_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "delay_implicit_rr_registration_until_rr_accessed"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/display_category_built_in_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/display_category_built_in_flag_values.textproto
deleted file mode 100644
index 49f7d4c9..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/display_category_built_in_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "display_category_built_in"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/display_listener_performance_improvements_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/display_listener_performance_improvements_flag_values.textproto
deleted file mode 100644
index e43bfe0d..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/display_listener_performance_improvements_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "display_listener_performance_improvements"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/display_topology_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/display_topology_flag_values.textproto
deleted file mode 100644
index 4494475a..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/display_topology_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "display_topology"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/doze_brightness_float_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/doze_brightness_float_flag_values.textproto
deleted file mode 100644
index 3597ae25..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/doze_brightness_float_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "doze_brightness_float"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_adaptive_tone_improvements_1_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_adaptive_tone_improvements_1_flag_values.textproto
deleted file mode 100644
index 6255d9ab..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_adaptive_tone_improvements_1_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_adaptive_tone_improvements_1"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_adaptive_tone_improvements_2_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_adaptive_tone_improvements_2_flag_values.textproto
deleted file mode 100644
index f98b2331..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_adaptive_tone_improvements_2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_adaptive_tone_improvements_2"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_apply_display_changed_during_display_added_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_apply_display_changed_during_display_added_flag_values.textproto
deleted file mode 100644
index 2c1583f9..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_apply_display_changed_during_display_added_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_apply_display_changed_during_display_added"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_battery_stats_for_all_displays_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_battery_stats_for_all_displays_flag_values.textproto
deleted file mode 100644
index f2e1bf84..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_battery_stats_for_all_displays_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_battery_stats_for_all_displays"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_connected_display_error_handling_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_connected_display_error_handling_flag_values.textproto
deleted file mode 100644
index 34e7d70b..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_connected_display_error_handling_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_connected_display_error_handling"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_connected_display_management_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_connected_display_management_flag_values.textproto
deleted file mode 100644
index 6d4df8e6..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_connected_display_management_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_connected_display_management"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_display_content_mode_management_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_display_content_mode_management_flag_values.textproto
deleted file mode 100644
index dd8dbeb0..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_display_content_mode_management_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_display_content_mode_management"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_display_offload_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_display_offload_flag_values.textproto
deleted file mode 100644
index 02c31b81..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_display_offload_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_display_offload"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_display_resolution_range_voting_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_display_resolution_range_voting_flag_values.textproto
deleted file mode 100644
index f80dac89..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_display_resolution_range_voting_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_display_resolution_range_voting"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_displays_refresh_rates_synchronization_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_displays_refresh_rates_synchronization_flag_values.textproto
deleted file mode 100644
index 384a834c..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_displays_refresh_rates_synchronization_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_displays_refresh_rates_synchronization"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_get_suggested_frame_rate_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_get_suggested_frame_rate_flag_values.textproto
deleted file mode 100644
index 2bf31ea8..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_get_suggested_frame_rate_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_get_suggested_frame_rate"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_get_supported_refresh_rates_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_get_supported_refresh_rates_flag_values.textproto
deleted file mode 100644
index 22f1a7be..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_get_supported_refresh_rates_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_get_supported_refresh_rates"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_has_arr_support_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_has_arr_support_flag_values.textproto
deleted file mode 100644
index 73add1ab..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_has_arr_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_has_arr_support"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_hdr_clamper_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_hdr_clamper_flag_values.textproto
deleted file mode 100644
index b7d18ae4..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_hdr_clamper_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_hdr_clamper"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_mode_limit_for_external_display_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_mode_limit_for_external_display_flag_values.textproto
deleted file mode 100644
index a2891e0b..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_mode_limit_for_external_display_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_mode_limit_for_external_display"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_nbm_controller_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_nbm_controller_flag_values.textproto
deleted file mode 100644
index a3f4e477..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_nbm_controller_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_nbm_controller"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_peak_refresh_rate_physical_limit_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_peak_refresh_rate_physical_limit_flag_values.textproto
deleted file mode 100644
index 15e91cac..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_peak_refresh_rate_physical_limit_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_peak_refresh_rate_physical_limit"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_pixel_anisotropy_correction_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_pixel_anisotropy_correction_flag_values.textproto
deleted file mode 100644
index ee1d2fd0..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_pixel_anisotropy_correction_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_pixel_anisotropy_correction"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_plugin_manager_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_plugin_manager_flag_values.textproto
deleted file mode 100644
index db0c94de..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_plugin_manager_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_plugin_manager"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_port_in_display_layout_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_port_in_display_layout_flag_values.textproto
deleted file mode 100644
index ddccec1a..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_port_in_display_layout_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_port_in_display_layout"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_power_throttling_clamper_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_power_throttling_clamper_flag_values.textproto
deleted file mode 100644
index 3c31c0f9..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_power_throttling_clamper_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_power_throttling_clamper"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_restrict_display_modes_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_restrict_display_modes_flag_values.textproto
deleted file mode 100644
index 7276d891..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_restrict_display_modes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_restrict_display_modes"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_synthetic_60hz_modes_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_synthetic_60hz_modes_flag_values.textproto
deleted file mode 100644
index 87f2a7c7..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_synthetic_60hz_modes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_synthetic_60hz_modes"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_user_refresh_rate_for_external_display_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_user_refresh_rate_for_external_display_flag_values.textproto
deleted file mode 100644
index 2a9157b2..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_user_refresh_rate_for_external_display_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_user_refresh_rate_for_external_display"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_vsync_low_light_vote_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_vsync_low_light_vote_flag_values.textproto
deleted file mode 100644
index 46594dbe..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_vsync_low_light_vote_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_vsync_low_light_vote"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_vsync_low_power_vote_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_vsync_low_power_vote_flag_values.textproto
deleted file mode 100644
index 15e1731c..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_vsync_low_power_vote_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_vsync_low_power_vote"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_waiting_confirmation_before_mirroring_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_waiting_confirmation_before_mirroring_flag_values.textproto
deleted file mode 100644
index 5d3a97e5..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_waiting_confirmation_before_mirroring_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_waiting_confirmation_before_mirroring"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/even_dimmer_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/even_dimmer_flag_values.textproto
deleted file mode 100644
index 365980d8..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/even_dimmer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "even_dimmer"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/fast_hdr_transitions_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/fast_hdr_transitions_flag_values.textproto
deleted file mode 100644
index 2a696027..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/fast_hdr_transitions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "fast_hdr_transitions"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/framerate_override_triggers_rr_callbacks_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/framerate_override_triggers_rr_callbacks_flag_values.textproto
deleted file mode 100644
index 4be97c0e..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/framerate_override_triggers_rr_callbacks_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "framerate_override_triggers_rr_callbacks"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/highest_hdr_sdr_ratio_api_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/highest_hdr_sdr_ratio_api_flag_values.textproto
deleted file mode 100644
index 7b9b8f4b..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/highest_hdr_sdr_ratio_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "highest_hdr_sdr_ratio_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/idle_screen_config_in_subscribing_light_sensor_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/idle_screen_config_in_subscribing_light_sensor_flag_values.textproto
deleted file mode 100644
index b8655744..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/idle_screen_config_in_subscribing_light_sensor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "idle_screen_config_in_subscribing_light_sensor"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/idle_screen_refresh_rate_timeout_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/idle_screen_refresh_rate_timeout_flag_values.textproto
deleted file mode 100644
index 20473134..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/idle_screen_refresh_rate_timeout_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "idle_screen_refresh_rate_timeout"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/ignore_app_preferred_refresh_rate_request_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/ignore_app_preferred_refresh_rate_request_flag_values.textproto
deleted file mode 100644
index 5c1d87aa..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/ignore_app_preferred_refresh_rate_request_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "ignore_app_preferred_refresh_rate_request"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/is_always_on_available_api_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/is_always_on_available_api_flag_values.textproto
deleted file mode 100644
index ed3b995f..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/is_always_on_available_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "is_always_on_available_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/new_hdr_brightness_modifier_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/new_hdr_brightness_modifier_flag_values.textproto
deleted file mode 100644
index 18a08d13..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/new_hdr_brightness_modifier_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "new_hdr_brightness_modifier"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/normal_brightness_for_doze_parameter_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/normal_brightness_for_doze_parameter_flag_values.textproto
deleted file mode 100644
index 93a657aa..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/normal_brightness_for_doze_parameter_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "normal_brightness_for_doze_parameter"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/offload_controls_doze_auto_brightness_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/offload_controls_doze_auto_brightness_flag_values.textproto
deleted file mode 100644
index 78b9e610..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/offload_controls_doze_auto_brightness_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "offload_controls_doze_auto_brightness"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/offload_doze_override_holds_wakelock_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/offload_doze_override_holds_wakelock_flag_values.textproto
deleted file mode 100644
index d6939773..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/offload_doze_override_holds_wakelock_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "offload_doze_override_holds_wakelock"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/offload_session_cancel_block_screen_on_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/offload_session_cancel_block_screen_on_flag_values.textproto
deleted file mode 100644
index 6c385f93..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/offload_session_cancel_block_screen_on_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "offload_session_cancel_block_screen_on"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/refactor_display_power_controller_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/refactor_display_power_controller_flag_values.textproto
deleted file mode 100644
index 2076b335..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/refactor_display_power_controller_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "refactor_display_power_controller"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/refresh_rate_event_for_foreground_apps_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/refresh_rate_event_for_foreground_apps_flag_values.textproto
deleted file mode 100644
index 45434953..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/refresh_rate_event_for_foreground_apps_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "refresh_rate_event_for_foreground_apps"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/refresh_rate_voting_telemetry_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/refresh_rate_voting_telemetry_flag_values.textproto
deleted file mode 100644
index 10f0b2ff..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/refresh_rate_voting_telemetry_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "refresh_rate_voting_telemetry"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/resolution_backup_restore_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/resolution_backup_restore_flag_values.textproto
deleted file mode 100644
index 1a0b8cd1..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/resolution_backup_restore_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "resolution_backup_restore"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/sensor_based_brightness_throttling_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/sensor_based_brightness_throttling_flag_values.textproto
deleted file mode 100644
index 07bd0cad..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/sensor_based_brightness_throttling_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "sensor_based_brightness_throttling"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/subscribe_granular_display_events_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/subscribe_granular_display_events_flag_values.textproto
deleted file mode 100644
index 70c0d747..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/subscribe_granular_display_events_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "subscribe_granular_display_events"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/use_fusion_prox_sensor_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/use_fusion_prox_sensor_flag_values.textproto
deleted file mode 100644
index 5375ad48..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/use_fusion_prox_sensor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "use_fusion_prox_sensor"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/virtual_display_limit_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/virtual_display_limit_flag_values.textproto
deleted file mode 100644
index 244d5177..00000000
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/virtual_display_limit_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "virtual_display_limit"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.dreams/Android.bp b/aconfig/trunk_staging/com.android.server.dreams/Android.bp
deleted file mode 100644
index 90902824..00000000
--- a/aconfig/trunk_staging/com.android.server.dreams/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.dreams-all",
-  package: "com.android.server.dreams",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.server.dreams/use_battery_changed_broadcast_flag_values.textproto b/aconfig/trunk_staging/com.android.server.dreams/use_battery_changed_broadcast_flag_values.textproto
deleted file mode 100644
index dc12dd4a..00000000
--- a/aconfig/trunk_staging/com.android.server.dreams/use_battery_changed_broadcast_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.dreams"
-  name: "use_battery_changed_broadcast"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.feature.flags/Android.bp b/aconfig/trunk_staging/com.android.server.feature.flags/Android.bp
deleted file mode 100644
index 1ebed69a..00000000
--- a/aconfig/trunk_staging/com.android.server.feature.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.feature.flags-all",
-  package: "com.android.server.feature.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.server.feature.flags/enable_read_dropbox_permission_flag_values.textproto b/aconfig/trunk_staging/com.android.server.feature.flags/enable_read_dropbox_permission_flag_values.textproto
deleted file mode 100644
index 92032551..00000000
--- a/aconfig/trunk_staging/com.android.server.feature.flags/enable_read_dropbox_permission_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.feature.flags"
-  name: "enable_read_dropbox_permission"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.flags/Android.bp b/aconfig/trunk_staging/com.android.server.flags/Android.bp
deleted file mode 100644
index 11fbd8cd..00000000
--- a/aconfig/trunk_staging/com.android.server.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.flags-all",
-    package: "com.android.server.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.server.flags/certpininstaller_removal_flag_values.textproto b/aconfig/trunk_staging/com.android.server.flags/certpininstaller_removal_flag_values.textproto
deleted file mode 100644
index f53fac24..00000000
--- a/aconfig/trunk_staging/com.android.server.flags/certpininstaller_removal_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.flags"
-  name: "certpininstaller_removal"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.flags/consolidate_battery_change_events_flag_values.textproto b/aconfig/trunk_staging/com.android.server.flags/consolidate_battery_change_events_flag_values.textproto
deleted file mode 100644
index 8aec2fbb..00000000
--- a/aconfig/trunk_staging/com.android.server.flags/consolidate_battery_change_events_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.flags"
-  name: "consolidate_battery_change_events"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.flags/datetime_notifications_flag_values.textproto b/aconfig/trunk_staging/com.android.server.flags/datetime_notifications_flag_values.textproto
deleted file mode 100644
index ce14b7f3..00000000
--- a/aconfig/trunk_staging/com.android.server.flags/datetime_notifications_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.flags"
-  name: "datetime_notifications"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.flags/disable_system_compaction_flag_values.textproto b/aconfig/trunk_staging/com.android.server.flags/disable_system_compaction_flag_values.textproto
deleted file mode 100644
index 554c6422..00000000
--- a/aconfig/trunk_staging/com.android.server.flags/disable_system_compaction_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.flags"
-  name: "disable_system_compaction"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.flags/early_data_manager_init_flag_values.textproto b/aconfig/trunk_staging/com.android.server.flags/early_data_manager_init_flag_values.textproto
deleted file mode 100644
index 9c27400a..00000000
--- a/aconfig/trunk_staging/com.android.server.flags/early_data_manager_init_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.flags"
-  name: "early_data_manager_init"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.flags/enable_odp_feature_guard_flag_values.textproto b/aconfig/trunk_staging/com.android.server.flags/enable_odp_feature_guard_flag_values.textproto
deleted file mode 100644
index 9528cfce..00000000
--- a/aconfig/trunk_staging/com.android.server.flags/enable_odp_feature_guard_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.flags"
-  name: "enable_odp_feature_guard"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.flags/modifier_shortcut_manager_multiuser_flag_values.textproto b/aconfig/trunk_staging/com.android.server.flags/modifier_shortcut_manager_multiuser_flag_values.textproto
deleted file mode 100644
index 332c3f5b..00000000
--- a/aconfig/trunk_staging/com.android.server.flags/modifier_shortcut_manager_multiuser_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.flags"
-  name: "modifier_shortcut_manager_multiuser"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.flags/new_bugreport_keyboard_shortcut_flag_values.textproto b/aconfig/trunk_staging/com.android.server.flags/new_bugreport_keyboard_shortcut_flag_values.textproto
deleted file mode 100644
index 30fde830..00000000
--- a/aconfig/trunk_staging/com.android.server.flags/new_bugreport_keyboard_shortcut_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.flags"
-  name: "new_bugreport_keyboard_shortcut"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.flags/optional_background_install_control_flag_values.textproto b/aconfig/trunk_staging/com.android.server.flags/optional_background_install_control_flag_values.textproto
deleted file mode 100644
index f7aec29d..00000000
--- a/aconfig/trunk_staging/com.android.server.flags/optional_background_install_control_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.flags"
-  name: "optional_background_install_control"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.flags/pin_global_quota_flag_values.textproto b/aconfig/trunk_staging/com.android.server.flags/pin_global_quota_flag_values.textproto
deleted file mode 100644
index ec2b6d0a..00000000
--- a/aconfig/trunk_staging/com.android.server.flags/pin_global_quota_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.flags"
-  name: "pin_global_quota"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.flags/pin_webview_flag_values.textproto b/aconfig/trunk_staging/com.android.server.flags/pin_webview_flag_values.textproto
deleted file mode 100644
index 6f036852..00000000
--- a/aconfig/trunk_staging/com.android.server.flags/pin_webview_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.flags"
-  name: "pin_webview"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.flags/pkg_targeted_battery_changed_not_sticky_flag_values.textproto b/aconfig/trunk_staging/com.android.server.flags/pkg_targeted_battery_changed_not_sticky_flag_values.textproto
deleted file mode 100644
index 12c8ba0d..00000000
--- a/aconfig/trunk_staging/com.android.server.flags/pkg_targeted_battery_changed_not_sticky_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.flags"
-  name: "pkg_targeted_battery_changed_not_sticky"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.flags/rate_limit_battery_changed_broadcast_flag_values.textproto b/aconfig/trunk_staging/com.android.server.flags/rate_limit_battery_changed_broadcast_flag_values.textproto
deleted file mode 100644
index 1139630a..00000000
--- a/aconfig/trunk_staging/com.android.server.flags/rate_limit_battery_changed_broadcast_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.flags"
-  name: "rate_limit_battery_changed_broadcast"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.flags/trace_battery_changed_broadcast_event_flag_values.textproto b/aconfig/trunk_staging/com.android.server.flags/trace_battery_changed_broadcast_event_flag_values.textproto
deleted file mode 100644
index 6d55633c..00000000
--- a/aconfig/trunk_staging/com.android.server.flags/trace_battery_changed_broadcast_event_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.flags"
-  name: "trace_battery_changed_broadcast_event"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.job/Android.bp b/aconfig/trunk_staging/com.android.server.job/Android.bp
deleted file mode 100644
index 4f74f919..00000000
--- a/aconfig/trunk_staging/com.android.server.job/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.job-all",
-    package: "com.android.server.job",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.server.job/additional_quota_for_system_installer_flag_values.textproto b/aconfig/trunk_staging/com.android.server.job/additional_quota_for_system_installer_flag_values.textproto
deleted file mode 100644
index 2c1f5776..00000000
--- a/aconfig/trunk_staging/com.android.server.job/additional_quota_for_system_installer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.job"
-  name: "additional_quota_for_system_installer"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.job/adjust_quota_default_constants_flag_values.textproto b/aconfig/trunk_staging/com.android.server.job/adjust_quota_default_constants_flag_values.textproto
deleted file mode 100644
index c3406db6..00000000
--- a/aconfig/trunk_staging/com.android.server.job/adjust_quota_default_constants_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.job"
-  name: "adjust_quota_default_constants"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.job/count_quota_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.server.job/count_quota_fix_flag_values.textproto
deleted file mode 100644
index 6c6879a7..00000000
--- a/aconfig/trunk_staging/com.android.server.job/count_quota_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.job"
-  name: "count_quota_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.job/create_work_chain_by_default_flag_values.textproto b/aconfig/trunk_staging/com.android.server.job/create_work_chain_by_default_flag_values.textproto
deleted file mode 100644
index 453c4fa4..00000000
--- a/aconfig/trunk_staging/com.android.server.job/create_work_chain_by_default_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.job"
-  name: "create_work_chain_by_default"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.job/enforce_quota_policy_to_fgs_jobs_flag_values.textproto b/aconfig/trunk_staging/com.android.server.job/enforce_quota_policy_to_fgs_jobs_flag_values.textproto
deleted file mode 100644
index af9f9422..00000000
--- a/aconfig/trunk_staging/com.android.server.job/enforce_quota_policy_to_fgs_jobs_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.job"
-  name: "enforce_quota_policy_to_fgs_jobs"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.job/enforce_quota_policy_to_top_started_jobs_flag_values.textproto b/aconfig/trunk_staging/com.android.server.job/enforce_quota_policy_to_top_started_jobs_flag_values.textproto
deleted file mode 100644
index ecb04969..00000000
--- a/aconfig/trunk_staging/com.android.server.job/enforce_quota_policy_to_top_started_jobs_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.job"
-  name: "enforce_quota_policy_to_top_started_jobs"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.job/enforce_schedule_limit_to_proxy_jobs_flag_values.textproto b/aconfig/trunk_staging/com.android.server.job/enforce_schedule_limit_to_proxy_jobs_flag_values.textproto
deleted file mode 100644
index 4c4f0958..00000000
--- a/aconfig/trunk_staging/com.android.server.job/enforce_schedule_limit_to_proxy_jobs_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.job"
-  name: "enforce_schedule_limit_to_proxy_jobs"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.job/include_trace_tag_in_job_name_flag_values.textproto b/aconfig/trunk_staging/com.android.server.job/include_trace_tag_in_job_name_flag_values.textproto
deleted file mode 100644
index ed46a0c2..00000000
--- a/aconfig/trunk_staging/com.android.server.job/include_trace_tag_in_job_name_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.job"
-  name: "include_trace_tag_in_job_name"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.job/relax_prefetch_connectivity_constraint_only_on_charger_flag_values.textproto b/aconfig/trunk_staging/com.android.server.job/relax_prefetch_connectivity_constraint_only_on_charger_flag_values.textproto
deleted file mode 100644
index dc2f5beb..00000000
--- a/aconfig/trunk_staging/com.android.server.job/relax_prefetch_connectivity_constraint_only_on_charger_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.job"
-  name: "relax_prefetch_connectivity_constraint_only_on_charger"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.job/remove_user_during_user_switch_flag_values.textproto b/aconfig/trunk_staging/com.android.server.job/remove_user_during_user_switch_flag_values.textproto
deleted file mode 100644
index 3e15f423..00000000
--- a/aconfig/trunk_staging/com.android.server.job/remove_user_during_user_switch_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.job"
-  name: "remove_user_during_user_switch"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.job/thermal_restrictions_to_fgs_jobs_flag_values.textproto b/aconfig/trunk_staging/com.android.server.job/thermal_restrictions_to_fgs_jobs_flag_values.textproto
deleted file mode 100644
index f330505c..00000000
--- a/aconfig/trunk_staging/com.android.server.job/thermal_restrictions_to_fgs_jobs_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.job"
-  name: "thermal_restrictions_to_fgs_jobs"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.job/tune_quota_window_default_parameters_flag_values.textproto b/aconfig/trunk_staging/com.android.server.job/tune_quota_window_default_parameters_flag_values.textproto
deleted file mode 100644
index d2f9a08f..00000000
--- a/aconfig/trunk_staging/com.android.server.job/tune_quota_window_default_parameters_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.job"
-  name: "tune_quota_window_default_parameters"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.job/use_correct_process_state_for_logging_flag_values.textproto b/aconfig/trunk_staging/com.android.server.job/use_correct_process_state_for_logging_flag_values.textproto
deleted file mode 100644
index 9439d76d..00000000
--- a/aconfig/trunk_staging/com.android.server.job/use_correct_process_state_for_logging_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.job"
-  name: "use_correct_process_state_for_logging"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.locksettings/Android.bp b/aconfig/trunk_staging/com.android.server.locksettings/Android.bp
deleted file mode 100644
index 82ae828a..00000000
--- a/aconfig/trunk_staging/com.android.server.locksettings/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.locksettings-all",
-  package: "com.android.server.locksettings",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.server.locksettings/wait_for_internet_ror_flag_values.textproto b/aconfig/trunk_staging/com.android.server.locksettings/wait_for_internet_ror_flag_values.textproto
deleted file mode 100644
index 2221063b..00000000
--- a/aconfig/trunk_staging/com.android.server.locksettings/wait_for_internet_ror_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.locksettings"
-  name: "wait_for_internet_ror"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.net/Android.bp b/aconfig/trunk_staging/com.android.server.net/Android.bp
deleted file mode 100644
index f84099d4..00000000
--- a/aconfig/trunk_staging/com.android.server.net/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.net-all",
-  package: "com.android.server.net",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.server.net/network_blocked_for_top_sleeping_and_above_flag_values.textproto b/aconfig/trunk_staging/com.android.server.net/network_blocked_for_top_sleeping_and_above_flag_values.textproto
deleted file mode 100644
index 68a6dccf..00000000
--- a/aconfig/trunk_staging/com.android.server.net/network_blocked_for_top_sleeping_and_above_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.net"
-  name: "network_blocked_for_top_sleeping_and_above"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.net/never_apply_rules_to_core_uids_flag_values.textproto b/aconfig/trunk_staging/com.android.server.net/never_apply_rules_to_core_uids_flag_values.textproto
deleted file mode 100644
index 74757969..00000000
--- a/aconfig/trunk_staging/com.android.server.net/never_apply_rules_to_core_uids_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.net"
-  name: "never_apply_rules_to_core_uids"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.net/use_metered_firewall_chains_flag_values.textproto b/aconfig/trunk_staging/com.android.server.net/use_metered_firewall_chains_flag_values.textproto
deleted file mode 100644
index 450e2f5b..00000000
--- a/aconfig/trunk_staging/com.android.server.net/use_metered_firewall_chains_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.net"
-  name: "use_metered_firewall_chains"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/Android.bp b/aconfig/trunk_staging/com.android.server.notification/Android.bp
deleted file mode 100644
index 7b255745..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.notification-all",
-    package: "com.android.server.notification",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/TEST_MAPPING b/aconfig/trunk_staging/com.android.server.notification/TEST_MAPPING
deleted file mode 100644
index 43fe2935..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/TEST_MAPPING
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "imports": [
-    {
-      "path": "cts/tests/tests/notification"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/aconfig/trunk_staging/com.android.server.notification/all_notifs_need_ttl_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/all_notifs_need_ttl_flag_values.textproto
deleted file mode 100644
index aa48777c..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/all_notifs_need_ttl_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "all_notifs_need_ttl"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/autogroup_summary_icon_update_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/autogroup_summary_icon_update_flag_values.textproto
deleted file mode 100644
index f436a217..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/autogroup_summary_icon_update_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "autogroup_summary_icon_update"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/cross_app_polite_notifications_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/cross_app_polite_notifications_flag_values.textproto
deleted file mode 100644
index 9527364a..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/cross_app_polite_notifications_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "cross_app_polite_notifications"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/expire_bitmaps_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/expire_bitmaps_flag_values.textproto
deleted file mode 100644
index 13550cb2..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/expire_bitmaps_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "expire_bitmaps"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/fix_calling_uid_from_cps_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/fix_calling_uid_from_cps_flag_values.textproto
deleted file mode 100644
index baabf809..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/fix_calling_uid_from_cps_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "fix_calling_uid_from_cps"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/nm_binder_perf_reduce_zen_broadcasts_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/nm_binder_perf_reduce_zen_broadcasts_flag_values.textproto
deleted file mode 100644
index 94fdc65c..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/nm_binder_perf_reduce_zen_broadcasts_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "nm_binder_perf_reduce_zen_broadcasts"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/nm_binder_perf_throttle_effects_suppressor_broadcast_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/nm_binder_perf_throttle_effects_suppressor_broadcast_flag_values.textproto
deleted file mode 100644
index 2bf2aa7e..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/nm_binder_perf_throttle_effects_suppressor_broadcast_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "nm_binder_perf_throttle_effects_suppressor_broadcast"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/notification_force_group_conversations_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/notification_force_group_conversations_flag_values.textproto
deleted file mode 100644
index f692ef3d..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/notification_force_group_conversations_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "notification_force_group_conversations"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/notification_force_group_singletons_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/notification_force_group_singletons_flag_values.textproto
deleted file mode 100644
index 2ebfa645..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/notification_force_group_singletons_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "notification_force_group_singletons"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/notification_hide_unused_channels_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/notification_hide_unused_channels_flag_values.textproto
deleted file mode 100644
index 9385ca13..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/notification_hide_unused_channels_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "notification_hide_unused_channels"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/notification_lock_screen_settings_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/notification_lock_screen_settings_flag_values.textproto
deleted file mode 100644
index 6a8d98c6..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/notification_lock_screen_settings_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "notification_lock_screen_settings"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/notification_minimalism_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/notification_minimalism_flag_values.textproto
deleted file mode 100644
index af7ba0ef..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/notification_minimalism_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "notification_minimalism"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/notification_test_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/notification_test_flag_values.textproto
deleted file mode 100644
index a0f62fed..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/notification_test_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "notification_test"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/notification_verify_channel_sound_uri_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/notification_verify_channel_sound_uri_flag_values.textproto
deleted file mode 100644
index 90146925..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/notification_verify_channel_sound_uri_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "notification_verify_channel_sound_uri"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/notification_vibration_in_sound_uri_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/notification_vibration_in_sound_uri_flag_values.textproto
deleted file mode 100644
index 06b9c920..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/notification_vibration_in_sound_uri_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "notification_vibration_in_sound_uri"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/persist_incomplete_restore_data_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/persist_incomplete_restore_data_flag_values.textproto
deleted file mode 100644
index 467faceb..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/persist_incomplete_restore_data_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "persist_incomplete_restore_data"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/polite_notifications_attn_update_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/polite_notifications_attn_update_flag_values.textproto
deleted file mode 100644
index b3febb00..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/polite_notifications_attn_update_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "polite_notifications_attn_update"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/polite_notifications_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/polite_notifications_flag_values.textproto
deleted file mode 100644
index 2b12ccb8..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/polite_notifications_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "polite_notifications"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/prevent_zen_device_effects_while_driving_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/prevent_zen_device_effects_while_driving_flag_values.textproto
deleted file mode 100644
index 6f91fc33..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/prevent_zen_device_effects_while_driving_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "prevent_zen_device_effects_while_driving"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/refactor_attention_helper_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/refactor_attention_helper_flag_values.textproto
deleted file mode 100644
index 4fbbb956..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/refactor_attention_helper_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "refactor_attention_helper"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/reject_old_notifications_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/reject_old_notifications_flag_values.textproto
deleted file mode 100644
index e46725cd..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/reject_old_notifications_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "reject_old_notifications"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/screenshare_notification_hiding_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/screenshare_notification_hiding_flag_values.textproto
deleted file mode 100644
index d4cb0a49..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/screenshare_notification_hiding_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "screenshare_notification_hiding"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/use_ssm_user_switch_signal_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/use_ssm_user_switch_signal_flag_values.textproto
deleted file mode 100644
index 1eb63a21..00000000
--- a/aconfig/trunk_staging/com.android.server.notification/use_ssm_user_switch_signal_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.notification"
-  name: "use_ssm_user_switch_signal"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.os/Android.bp b/aconfig/trunk_staging/com.android.server.os/Android.bp
deleted file mode 100644
index 9e6549c8..00000000
--- a/aconfig/trunk_staging/com.android.server.os/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.os-all",
-    package: "com.android.server.os",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.server.os/proto_tombstone_flag_values.textproto b/aconfig/trunk_staging/com.android.server.os/proto_tombstone_flag_values.textproto
deleted file mode 100644
index ce935bbd..00000000
--- a/aconfig/trunk_staging/com.android.server.os/proto_tombstone_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.os"
-  name: "proto_tombstone"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.pm/Android.bp b/aconfig/trunk_staging/com.android.server.pm/Android.bp
deleted file mode 100644
index 3da38b2e..00000000
--- a/aconfig/trunk_staging/com.android.server.pm/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.pm-all",
-  package: "com.android.server.pm",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.server.policy.feature.flags/Android.bp b/aconfig/trunk_staging/com.android.server.policy.feature.flags/Android.bp
deleted file mode 100644
index 0289dcd2..00000000
--- a/aconfig/trunk_staging/com.android.server.policy.feature.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.policy.feature.flags-all",
-    package: "com.android.server.policy.feature.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.server.policy.feature.flags/enable_dual_display_blocking_flag_values.textproto b/aconfig/trunk_staging/com.android.server.policy.feature.flags/enable_dual_display_blocking_flag_values.textproto
deleted file mode 100644
index 201326ce..00000000
--- a/aconfig/trunk_staging/com.android.server.policy.feature.flags/enable_dual_display_blocking_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.policy.feature.flags"
-  name: "enable_dual_display_blocking"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.policy.feature.flags/enable_foldables_posture_based_closed_state_flag_values.textproto b/aconfig/trunk_staging/com.android.server.policy.feature.flags/enable_foldables_posture_based_closed_state_flag_values.textproto
deleted file mode 100644
index b9ceb784..00000000
--- a/aconfig/trunk_staging/com.android.server.policy.feature.flags/enable_foldables_posture_based_closed_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.policy.feature.flags"
-  name: "enable_foldables_posture_based_closed_state"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.policy.feature.flags/force_foldables_tent_mode_with_screen_wakelock_flag_values.textproto b/aconfig/trunk_staging/com.android.server.policy.feature.flags/force_foldables_tent_mode_with_screen_wakelock_flag_values.textproto
deleted file mode 100644
index 8a189b0f..00000000
--- a/aconfig/trunk_staging/com.android.server.policy.feature.flags/force_foldables_tent_mode_with_screen_wakelock_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.policy.feature.flags"
-  name: "force_foldables_tent_mode_with_screen_wakelock"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.policy/Android.bp b/aconfig/trunk_staging/com.android.server.policy/Android.bp
deleted file mode 100644
index d985843e..00000000
--- a/aconfig/trunk_staging/com.android.server.policy/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.policy-all",
-  package: "com.android.server.policy",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.server.policy/support_input_wakeup_delegate_flag_values.textproto b/aconfig/trunk_staging/com.android.server.policy/support_input_wakeup_delegate_flag_values.textproto
deleted file mode 100644
index 5080c808..00000000
--- a/aconfig/trunk_staging/com.android.server.policy/support_input_wakeup_delegate_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.policy"
-  name: "support_input_wakeup_delegate"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.batterysaver/Android.bp b/aconfig/trunk_staging/com.android.server.power.batterysaver/Android.bp
deleted file mode 100644
index 4b5997f0..00000000
--- a/aconfig/trunk_staging/com.android.server.power.batterysaver/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.power.batterysaver-all",
-  package: "com.android.server.power.batterysaver",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.batterysaver/update_auto_turn_on_notification_string_and_action_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.batterysaver/update_auto_turn_on_notification_string_and_action_flag_values.textproto
deleted file mode 100644
index b6e20e81..00000000
--- a/aconfig/trunk_staging/com.android.server.power.batterysaver/update_auto_turn_on_notification_string_and_action_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.power.batterysaver"
-  name: "update_auto_turn_on_notification_string_and_action"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.feature.flags/Android.bp b/aconfig/trunk_staging/com.android.server.power.feature.flags/Android.bp
deleted file mode 100644
index 3797636c..00000000
--- a/aconfig/trunk_staging/com.android.server.power.feature.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.power.feature.flags-all",
-    package: "com.android.server.power.feature.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.feature.flags/disable_frozen_process_wakelocks_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.feature.flags/disable_frozen_process_wakelocks_flag_values.textproto
deleted file mode 100644
index f03ca0fb..00000000
--- a/aconfig/trunk_staging/com.android.server.power.feature.flags/disable_frozen_process_wakelocks_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.power.feature.flags"
-  name: "disable_frozen_process_wakelocks"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.feature.flags/enable_early_screen_timeout_detector_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.feature.flags/enable_early_screen_timeout_detector_flag_values.textproto
deleted file mode 100644
index c64007d7..00000000
--- a/aconfig/trunk_staging/com.android.server.power.feature.flags/enable_early_screen_timeout_detector_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.power.feature.flags"
-  name: "enable_early_screen_timeout_detector"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.feature.flags/enable_screen_timeout_policy_listener_api_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.feature.flags/enable_screen_timeout_policy_listener_api_flag_values.textproto
deleted file mode 100644
index c433ec4d..00000000
--- a/aconfig/trunk_staging/com.android.server.power.feature.flags/enable_screen_timeout_policy_listener_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.power.feature.flags"
-  name: "enable_screen_timeout_policy_listener_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.feature.flags/improve_wakelock_latency_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.feature.flags/improve_wakelock_latency_flag_values.textproto
deleted file mode 100644
index 6a8f979e..00000000
--- a/aconfig/trunk_staging/com.android.server.power.feature.flags/improve_wakelock_latency_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.power.feature.flags"
-  name: "improve_wakelock_latency"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.feature.flags/move_wsc_logging_to_notifier_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.feature.flags/move_wsc_logging_to_notifier_flag_values.textproto
deleted file mode 100644
index 17b3fab7..00000000
--- a/aconfig/trunk_staging/com.android.server.power.feature.flags/move_wsc_logging_to_notifier_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.power.feature.flags"
-  name: "move_wsc_logging_to_notifier"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.feature.flags/per_display_wake_by_touch_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.feature.flags/per_display_wake_by_touch_flag_values.textproto
deleted file mode 100644
index 5971419c..00000000
--- a/aconfig/trunk_staging/com.android.server.power.feature.flags/per_display_wake_by_touch_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.power.feature.flags"
-  name: "per_display_wake_by_touch"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.feature.flags/policy_reason_in_display_power_request_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.feature.flags/policy_reason_in_display_power_request_flag_values.textproto
deleted file mode 100644
index d70446b8..00000000
--- a/aconfig/trunk_staging/com.android.server.power.feature.flags/policy_reason_in_display_power_request_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.power.feature.flags"
-  name: "policy_reason_in_display_power_request"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.feature.flags/wakelock_attribution_via_workchain_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.feature.flags/wakelock_attribution_via_workchain_flag_values.textproto
deleted file mode 100644
index bc4bc983..00000000
--- a/aconfig/trunk_staging/com.android.server.power.feature.flags/wakelock_attribution_via_workchain_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.power.feature.flags"
-  name: "wakelock_attribution_via_workchain"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.hint/Android.bp b/aconfig/trunk_staging/com.android.server.power.hint/Android.bp
deleted file mode 100644
index 90b57c7c..00000000
--- a/aconfig/trunk_staging/com.android.server.power.hint/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.power.hint-all",
-    package: "com.android.server.power.hint",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.hint/adpf_session_tag_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.hint/adpf_session_tag_flag_values.textproto
deleted file mode 100644
index 9c7a81e9..00000000
--- a/aconfig/trunk_staging/com.android.server.power.hint/adpf_session_tag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.power.hint"
-  name: "adpf_session_tag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.hint/powerhint_thread_cleanup_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.hint/powerhint_thread_cleanup_flag_values.textproto
deleted file mode 100644
index dfd0d9d6..00000000
--- a/aconfig/trunk_staging/com.android.server.power.hint/powerhint_thread_cleanup_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.power.hint"
-  name: "powerhint_thread_cleanup"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.hint/reset_on_fork_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.hint/reset_on_fork_enabled_flag_values.textproto
deleted file mode 100644
index 75f47dce..00000000
--- a/aconfig/trunk_staging/com.android.server.power.hint/reset_on_fork_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.power.hint"
-  name: "reset_on_fork_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.optimization/Android.bp b/aconfig/trunk_staging/com.android.server.power.optimization/Android.bp
deleted file mode 100644
index a4839c85..00000000
--- a/aconfig/trunk_staging/com.android.server.power.optimization/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.power.optimization-all",
-    package: "com.android.server.power.optimization",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.optimization/accumulate_battery_usage_stats_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.optimization/accumulate_battery_usage_stats_flag_values.textproto
deleted file mode 100644
index 90855444..00000000
--- a/aconfig/trunk_staging/com.android.server.power.optimization/accumulate_battery_usage_stats_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.power.optimization"
-  name: "accumulate_battery_usage_stats"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.optimization/add_battery_usage_stats_slice_atom_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.optimization/add_battery_usage_stats_slice_atom_flag_values.textproto
deleted file mode 100644
index 5c6f5547..00000000
--- a/aconfig/trunk_staging/com.android.server.power.optimization/add_battery_usage_stats_slice_atom_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.power.optimization"
-  name: "add_battery_usage_stats_slice_atom"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.optimization/battery_stats_screen_state_event_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.optimization/battery_stats_screen_state_event_flag_values.textproto
deleted file mode 100644
index 4def078b..00000000
--- a/aconfig/trunk_staging/com.android.server.power.optimization/battery_stats_screen_state_event_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.power.optimization"
-  name: "battery_stats_screen_state_event"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.optimization/battery_usage_stats_by_power_and_screen_state_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.optimization/battery_usage_stats_by_power_and_screen_state_flag_values.textproto
deleted file mode 100644
index a74d8c7c..00000000
--- a/aconfig/trunk_staging/com.android.server.power.optimization/battery_usage_stats_by_power_and_screen_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.power.optimization"
-  name: "battery_usage_stats_by_power_and_screen_state"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.optimization/disable_system_service_power_attr_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.optimization/disable_system_service_power_attr_flag_values.textproto
deleted file mode 100644
index 0e7fd9bc..00000000
--- a/aconfig/trunk_staging/com.android.server.power.optimization/disable_system_service_power_attr_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.power.optimization"
-  name: "disable_system_service_power_attr"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.optimization/extended_battery_history_compression_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.optimization/extended_battery_history_compression_enabled_flag_values.textproto
deleted file mode 100644
index 4eb1a97f..00000000
--- a/aconfig/trunk_staging/com.android.server.power.optimization/extended_battery_history_compression_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.power.optimization"
-  name: "extended_battery_history_compression_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.optimization/extended_battery_history_continuous_collection_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.optimization/extended_battery_history_continuous_collection_enabled_flag_values.textproto
deleted file mode 100644
index 5f127709..00000000
--- a/aconfig/trunk_staging/com.android.server.power.optimization/extended_battery_history_continuous_collection_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.power.optimization"
-  name: "extended_battery_history_continuous_collection_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.optimization/oneway_battery_stats_service_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.optimization/oneway_battery_stats_service_flag_values.textproto
deleted file mode 100644
index d5f7d63b..00000000
--- a/aconfig/trunk_staging/com.android.server.power.optimization/oneway_battery_stats_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.power.optimization"
-  name: "oneway_battery_stats_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.optimization/power_monitor_api_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.optimization/power_monitor_api_flag_values.textproto
deleted file mode 100644
index 49492b72..00000000
--- a/aconfig/trunk_staging/com.android.server.power.optimization/power_monitor_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.power.optimization"
-  name: "power_monitor_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.optimization/streamlined_battery_stats_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.optimization/streamlined_battery_stats_flag_values.textproto
deleted file mode 100644
index 1496f0b4..00000000
--- a/aconfig/trunk_staging/com.android.server.power.optimization/streamlined_battery_stats_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.power.optimization"
-  name: "streamlined_battery_stats"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.optimization/streamlined_connectivity_battery_stats_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.optimization/streamlined_connectivity_battery_stats_flag_values.textproto
deleted file mode 100644
index a5736723..00000000
--- a/aconfig/trunk_staging/com.android.server.power.optimization/streamlined_connectivity_battery_stats_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.power.optimization"
-  name: "streamlined_connectivity_battery_stats"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.power.optimization/streamlined_misc_battery_stats_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.optimization/streamlined_misc_battery_stats_flag_values.textproto
deleted file mode 100644
index 4c51d2ff..00000000
--- a/aconfig/trunk_staging/com.android.server.power.optimization/streamlined_misc_battery_stats_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.power.optimization"
-  name: "streamlined_misc_battery_stats"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.powerstats/Android.bp b/aconfig/trunk_staging/com.android.server.powerstats/Android.bp
deleted file mode 100644
index 725bb217..00000000
--- a/aconfig/trunk_staging/com.android.server.powerstats/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.powerstats-all",
-  package: "com.android.server.powerstats",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.server.powerstats/verify_non_null_arguments_flag_values.textproto b/aconfig/trunk_staging/com.android.server.powerstats/verify_non_null_arguments_flag_values.textproto
deleted file mode 100644
index 7eb7727d..00000000
--- a/aconfig/trunk_staging/com.android.server.powerstats/verify_non_null_arguments_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.powerstats"
-  name: "verify_non_null_arguments"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.print/Android.bp b/aconfig/trunk_staging/com.android.server.print/Android.bp
deleted file mode 100644
index be6b057a..00000000
--- a/aconfig/trunk_staging/com.android.server.print/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.print-all",
-    package: "com.android.server.print",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.server.print/do_not_include_capabilities_flag_values.textproto b/aconfig/trunk_staging/com.android.server.print/do_not_include_capabilities_flag_values.textproto
deleted file mode 100644
index fce5bd0b..00000000
--- a/aconfig/trunk_staging/com.android.server.print/do_not_include_capabilities_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.print"
-  name: "do_not_include_capabilities"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.security/Android.bp b/aconfig/trunk_staging/com.android.server.security/Android.bp
deleted file mode 100644
index 50a51927..00000000
--- a/aconfig/trunk_staging/com.android.server.security/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.security-all",
-  package: "com.android.server.security",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.server.selinux.flags/Android.bp b/aconfig/trunk_staging/com.android.server.selinux.flags/Android.bp
deleted file mode 100644
index 31ae16cc..00000000
--- a/aconfig/trunk_staging/com.android.server.selinux.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.selinux.flags-all",
-    package: "com.android.server.selinux.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.server.selinux.flags/selinux_logs_collect_flag_values.textproto b/aconfig/trunk_staging/com.android.server.selinux.flags/selinux_logs_collect_flag_values.textproto
deleted file mode 100644
index 8321a36b..00000000
--- a/aconfig/trunk_staging/com.android.server.selinux.flags/selinux_logs_collect_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.selinux.flags"
-  name: "selinux_logs_collect"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.stats/Android.bp b/aconfig/trunk_staging/com.android.server.stats/Android.bp
deleted file mode 100644
index 857762c3..00000000
--- a/aconfig/trunk_staging/com.android.server.stats/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.stats-all",
-    package: "com.android.server.stats",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.server.stats/accumulate_network_stats_since_boot_flag_values.textproto b/aconfig/trunk_staging/com.android.server.stats/accumulate_network_stats_since_boot_flag_values.textproto
deleted file mode 100644
index 4b73d9f9..00000000
--- a/aconfig/trunk_staging/com.android.server.stats/accumulate_network_stats_since_boot_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.stats"
-  name: "accumulate_network_stats_since_boot"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.stats/add_mobile_bytes_transfer_by_proc_state_puller_flag_values.textproto b/aconfig/trunk_staging/com.android.server.stats/add_mobile_bytes_transfer_by_proc_state_puller_flag_values.textproto
deleted file mode 100644
index 9a0bf0b6..00000000
--- a/aconfig/trunk_staging/com.android.server.stats/add_mobile_bytes_transfer_by_proc_state_puller_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.stats"
-  name: "add_mobile_bytes_transfer_by_proc_state_puller"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.stats/add_pressure_stall_information_puller_flag_values.textproto b/aconfig/trunk_staging/com.android.server.stats/add_pressure_stall_information_puller_flag_values.textproto
deleted file mode 100644
index e40eb5a1..00000000
--- a/aconfig/trunk_staging/com.android.server.stats/add_pressure_stall_information_puller_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.stats"
-  name: "add_pressure_stall_information_puller"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.stats/apply_network_stats_poll_rate_limit_flag_values.textproto b/aconfig/trunk_staging/com.android.server.stats/apply_network_stats_poll_rate_limit_flag_values.textproto
deleted file mode 100644
index 70ec7664..00000000
--- a/aconfig/trunk_staging/com.android.server.stats/apply_network_stats_poll_rate_limit_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.stats"
-  name: "apply_network_stats_poll_rate_limit"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.stats/netstats_use_add_entries_flag_values.textproto b/aconfig/trunk_staging/com.android.server.stats/netstats_use_add_entries_flag_values.textproto
deleted file mode 100644
index a4777408..00000000
--- a/aconfig/trunk_staging/com.android.server.stats/netstats_use_add_entries_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.stats"
-  name: "netstats_use_add_entries"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/Android.bp b/aconfig/trunk_staging/com.android.server.telecom.flags/Android.bp
deleted file mode 100644
index 69bbae9d..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.telecom.flags-all",
-    package: "com.android.server.telecom.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/add_call_uri_for_missed_calls_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/add_call_uri_for_missed_calls_flag_values.textproto
deleted file mode 100644
index 2656fe68..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/add_call_uri_for_missed_calls_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "add_call_uri_for_missed_calls"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/allow_system_apps_resolve_voip_calls_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/allow_system_apps_resolve_voip_calls_flag_values.textproto
deleted file mode 100644
index 9702372c..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/allow_system_apps_resolve_voip_calls_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "allow_system_apps_resolve_voip_calls"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/associated_user_refactor_for_work_profile_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/associated_user_refactor_for_work_profile_flag_values.textproto
deleted file mode 100644
index f3e9e3f6..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/associated_user_refactor_for_work_profile_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "associated_user_refactor_for_work_profile"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/available_routes_never_updated_after_set_system_audio_state_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/available_routes_never_updated_after_set_system_audio_state_flag_values.textproto
deleted file mode 100644
index 95d629be..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/available_routes_never_updated_after_set_system_audio_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "available_routes_never_updated_after_set_system_audio_state"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/bus_device_is_a_speaker_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/bus_device_is_a_speaker_flag_values.textproto
deleted file mode 100644
index d2d089d8..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/bus_device_is_a_speaker_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "bus_device_is_a_speaker"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/business_call_composer_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/business_call_composer_flag_values.textproto
deleted file mode 100644
index 0bcec9d0..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/business_call_composer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "business_call_composer"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/cache_call_audio_callbacks_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/cache_call_audio_callbacks_flag_values.textproto
deleted file mode 100644
index 23dffbef..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/cache_call_audio_callbacks_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "cache_call_audio_callbacks"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/cache_call_events_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/cache_call_events_flag_values.textproto
deleted file mode 100644
index 969266bb..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/cache_call_events_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "cache_call_events"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/call_audio_communication_device_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/call_audio_communication_device_refactor_flag_values.textproto
deleted file mode 100644
index 09384fc1..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/call_audio_communication_device_refactor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "call_audio_communication_device_refactor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/call_audio_routing_performance_improvemenent_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/call_audio_routing_performance_improvemenent_flag_values.textproto
deleted file mode 100644
index a5e86613..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/call_audio_routing_performance_improvemenent_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "call_audio_routing_performance_improvemenent"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/call_details_id_changes_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/call_details_id_changes_flag_values.textproto
deleted file mode 100644
index b86e2c22..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/call_details_id_changes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "call_details_id_changes"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/call_sequencing_call_resume_failed_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/call_sequencing_call_resume_failed_flag_values.textproto
deleted file mode 100644
index 9e95e5e5..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/call_sequencing_call_resume_failed_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "call_sequencing_call_resume_failed"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/cancel_removal_on_emergency_redial_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/cancel_removal_on_emergency_redial_flag_values.textproto
deleted file mode 100644
index 3a7dbfb2..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/cancel_removal_on_emergency_redial_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "cancel_removal_on_emergency_redial"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/check_completed_filters_on_timeout_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/check_completed_filters_on_timeout_flag_values.textproto
deleted file mode 100644
index c7d7dfb6..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/check_completed_filters_on_timeout_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "check_completed_filters_on_timeout"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/check_device_type_on_route_change_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/check_device_type_on_route_change_flag_values.textproto
deleted file mode 100644
index 53fd899a..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/check_device_type_on_route_change_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "check_device_type_on_route_change"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/clear_communication_device_after_audio_ops_complete_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/clear_communication_device_after_audio_ops_complete_flag_values.textproto
deleted file mode 100644
index 6bbcc5bf..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/clear_communication_device_after_audio_ops_complete_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "clear_communication_device_after_audio_ops_complete"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/communication_device_protected_by_lock_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/communication_device_protected_by_lock_flag_values.textproto
deleted file mode 100644
index afb219e7..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/communication_device_protected_by_lock_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "communication_device_protected_by_lock"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/csw_service_interface_is_null_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/csw_service_interface_is_null_flag_values.textproto
deleted file mode 100644
index 26ffe2fb..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/csw_service_interface_is_null_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "csw_service_interface_is_null"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/default_speaker_on_wired_headset_disconnect_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/default_speaker_on_wired_headset_disconnect_flag_values.textproto
deleted file mode 100644
index 2d195fe8..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/default_speaker_on_wired_headset_disconnect_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "default_speaker_on_wired_headset_disconnect"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/disconnect_self_managed_stuck_startup_calls_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/disconnect_self_managed_stuck_startup_calls_flag_values.textproto
deleted file mode 100644
index 5e03c882..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/disconnect_self_managed_stuck_startup_calls_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "disconnect_self_managed_stuck_startup_calls"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/do_not_send_call_to_null_ics_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/do_not_send_call_to_null_ics_flag_values.textproto
deleted file mode 100644
index 6a72a9ea..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/do_not_send_call_to_null_ics_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "do_not_send_call_to_null_ics"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/dont_timeout_destroyed_calls_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/dont_timeout_destroyed_calls_flag_values.textproto
deleted file mode 100644
index dedc6980..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/dont_timeout_destroyed_calls_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "dont_timeout_destroyed_calls"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/dont_use_communication_device_tracker_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/dont_use_communication_device_tracker_flag_values.textproto
deleted file mode 100644
index 173c43cc..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/dont_use_communication_device_tracker_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "dont_use_communication_device_tracker"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/early_binding_to_incall_service_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/early_binding_to_incall_service_flag_values.textproto
deleted file mode 100644
index 40c7ba90..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/early_binding_to_incall_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "early_binding_to_incall_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/early_update_internal_call_audio_state_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/early_update_internal_call_audio_state_flag_values.textproto
deleted file mode 100644
index f5f7f8e1..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/early_update_internal_call_audio_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "early_update_internal_call_audio_state"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/ecc_keyguard_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/ecc_keyguard_flag_values.textproto
deleted file mode 100644
index d0b2d9a6..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/ecc_keyguard_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "ecc_keyguard"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/enable_call_audio_watchdog_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/enable_call_audio_watchdog_flag_values.textproto
deleted file mode 100644
index 31881231..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/enable_call_audio_watchdog_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "enable_call_audio_watchdog"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/enable_call_exception_anom_reports_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/enable_call_exception_anom_reports_flag_values.textproto
deleted file mode 100644
index c63d0350..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/enable_call_exception_anom_reports_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "enable_call_exception_anom_reports"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/enable_call_sequencing_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/enable_call_sequencing_flag_values.textproto
deleted file mode 100644
index 6b9d55d9..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/enable_call_sequencing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "enable_call_sequencing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/enable_respond_via_sms_manager_async_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/enable_respond_via_sms_manager_async_flag_values.textproto
deleted file mode 100644
index 62ea0d83..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/enable_respond_via_sms_manager_async_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "enable_respond_via_sms_manager_async"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/end_session_improvements_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/end_session_improvements_flag_values.textproto
deleted file mode 100644
index ac55ce3e..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/end_session_improvements_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "end_session_improvements"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/ensure_audio_mode_updates_on_foreground_call_change_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/ensure_audio_mode_updates_on_foreground_call_change_flag_values.textproto
deleted file mode 100644
index c0007605..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/ensure_audio_mode_updates_on_foreground_call_change_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "ensure_audio_mode_updates_on_foreground_call_change"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/ensure_in_car_ringing_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/ensure_in_car_ringing_flag_values.textproto
deleted file mode 100644
index c8553cf0..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/ensure_in_car_ringing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "ensure_in_car_ringing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/fix_audio_flicker_for_outgoing_calls_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/fix_audio_flicker_for_outgoing_calls_flag_values.textproto
deleted file mode 100644
index bedadf9a..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/fix_audio_flicker_for_outgoing_calls_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "fix_audio_flicker_for_outgoing_calls"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/fix_user_request_baseline_route_video_call_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/fix_user_request_baseline_route_video_call_flag_values.textproto
deleted file mode 100644
index ab7f651b..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/fix_user_request_baseline_route_video_call_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "fix_user_request_baseline_route_video_call"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/gen_anom_report_on_focus_timeout_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/gen_anom_report_on_focus_timeout_flag_values.textproto
deleted file mode 100644
index f827880c..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/gen_anom_report_on_focus_timeout_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "gen_anom_report_on_focus_timeout"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/get_last_known_cell_identity_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/get_last_known_cell_identity_flag_values.textproto
deleted file mode 100644
index 113931de..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/get_last_known_cell_identity_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "get_last_known_cell_identity"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/get_registered_phone_accounts_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/get_registered_phone_accounts_flag_values.textproto
deleted file mode 100644
index c3782a76..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/get_registered_phone_accounts_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "get_registered_phone_accounts"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/get_ringer_mode_anom_report_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/get_ringer_mode_anom_report_flag_values.textproto
deleted file mode 100644
index a57309b5..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/get_ringer_mode_anom_report_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "get_ringer_mode_anom_report"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/ignore_auto_route_to_watch_device_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/ignore_auto_route_to_watch_device_flag_values.textproto
deleted file mode 100644
index fc28f02e..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/ignore_auto_route_to_watch_device_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "ignore_auto_route_to_watch_device"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/is_new_outgoing_call_broadcast_unblocking_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/is_new_outgoing_call_broadcast_unblocking_flag_values.textproto
deleted file mode 100644
index 1973a167..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/is_new_outgoing_call_broadcast_unblocking_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "is_new_outgoing_call_broadcast_unblocking"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/keep_bluetooth_devices_cache_updated_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/keep_bluetooth_devices_cache_updated_flag_values.textproto
deleted file mode 100644
index 3a908fa2..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/keep_bluetooth_devices_cache_updated_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "keep_bluetooth_devices_cache_updated"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/new_audio_path_speaker_broadcast_and_unfocused_routing_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/new_audio_path_speaker_broadcast_and_unfocused_routing_flag_values.textproto
deleted file mode 100644
index 85d9d50e..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/new_audio_path_speaker_broadcast_and_unfocused_routing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "new_audio_path_speaker_broadcast_and_unfocused_routing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/on_call_endpoint_changed_ics_on_connected_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/on_call_endpoint_changed_ics_on_connected_flag_values.textproto
deleted file mode 100644
index 7b4f55e7..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/on_call_endpoint_changed_ics_on_connected_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "on_call_endpoint_changed_ics_on_connected"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/only_clear_communication_device_on_inactive_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/only_clear_communication_device_on_inactive_flag_values.textproto
deleted file mode 100644
index 04ce1654..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/only_clear_communication_device_on_inactive_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "only_clear_communication_device_on_inactive"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/only_update_telephony_on_valid_sub_ids_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/only_update_telephony_on_valid_sub_ids_flag_values.textproto
deleted file mode 100644
index cf044fe0..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/only_update_telephony_on_valid_sub_ids_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "only_update_telephony_on_valid_sub_ids"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/postpone_register_to_leaudio_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/postpone_register_to_leaudio_flag_values.textproto
deleted file mode 100644
index e79ad314..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/postpone_register_to_leaudio_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "postpone_register_to_leaudio"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/prevent_redundant_location_permission_grant_and_revoke_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/prevent_redundant_location_permission_grant_and_revoke_flag_values.textproto
deleted file mode 100644
index 10654a2a..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/prevent_redundant_location_permission_grant_and_revoke_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "prevent_redundant_location_permission_grant_and_revoke"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/profile_user_support_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/profile_user_support_flag_values.textproto
deleted file mode 100644
index 0ccb9525..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/profile_user_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "profile_user_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/remap_transactional_capabilities_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/remap_transactional_capabilities_flag_values.textproto
deleted file mode 100644
index 79f48ba4..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/remap_transactional_capabilities_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "remap_transactional_capabilities"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/reset_mute_when_entering_quiescent_bt_route_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/reset_mute_when_entering_quiescent_bt_route_flag_values.textproto
deleted file mode 100644
index dc1c8621..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/reset_mute_when_entering_quiescent_bt_route_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "reset_mute_when_entering_quiescent_bt_route"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/resolve_active_bt_routing_and_bt_timing_issue_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/resolve_active_bt_routing_and_bt_timing_issue_flag_values.textproto
deleted file mode 100644
index ff56fcdd..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/resolve_active_bt_routing_and_bt_timing_issue_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "resolve_active_bt_routing_and_bt_timing_issue"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/resolve_switching_bt_devices_computation_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/resolve_switching_bt_devices_computation_flag_values.textproto
deleted file mode 100644
index 6226a8fd..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/resolve_switching_bt_devices_computation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "resolve_switching_bt_devices_computation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/separately_bind_to_bt_incall_service_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/separately_bind_to_bt_incall_service_flag_values.textproto
deleted file mode 100644
index cc791e8a..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/separately_bind_to_bt_incall_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "separately_bind_to_bt_incall_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/set_audio_mode_before_abandon_focus_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/set_audio_mode_before_abandon_focus_flag_values.textproto
deleted file mode 100644
index 18e84715..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/set_audio_mode_before_abandon_focus_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "set_audio_mode_before_abandon_focus"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/set_mute_state_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/set_mute_state_flag_values.textproto
deleted file mode 100644
index 3e884b03..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/set_mute_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "set_mute_state"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/set_remote_connection_call_id_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/set_remote_connection_call_id_flag_values.textproto
deleted file mode 100644
index 4984c725..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/set_remote_connection_call_id_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "set_remote_connection_call_id"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/skip_baseline_switch_when_route_not_bluetooth_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/skip_baseline_switch_when_route_not_bluetooth_flag_values.textproto
deleted file mode 100644
index 127f37a4..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/skip_baseline_switch_when_route_not_bluetooth_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "skip_baseline_switch_when_route_not_bluetooth"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/skip_filter_phone_account_perform_dnd_filter_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/skip_filter_phone_account_perform_dnd_filter_flag_values.textproto
deleted file mode 100644
index 60186d18..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/skip_filter_phone_account_perform_dnd_filter_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "skip_filter_phone_account_perform_dnd_filter"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/telecom_log_external_wearable_calls_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/telecom_log_external_wearable_calls_flag_values.textproto
deleted file mode 100644
index d84ad546..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/telecom_log_external_wearable_calls_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "telecom_log_external_wearable_calls"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/telecom_main_user_in_block_check_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/telecom_main_user_in_block_check_flag_values.textproto
deleted file mode 100644
index 4c196871..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/telecom_main_user_in_block_check_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "telecom_main_user_in_block_check"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/telecom_main_user_in_get_respond_message_app_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/telecom_main_user_in_get_respond_message_app_flag_values.textproto
deleted file mode 100644
index bd4faf21..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/telecom_main_user_in_get_respond_message_app_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "telecom_main_user_in_get_respond_message_app"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/telecom_mainline_blocked_numbers_manager_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/telecom_mainline_blocked_numbers_manager_flag_values.textproto
deleted file mode 100644
index 4ae6a426..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/telecom_mainline_blocked_numbers_manager_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "telecom_mainline_blocked_numbers_manager"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/telecom_metrics_support_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/telecom_metrics_support_flag_values.textproto
deleted file mode 100644
index 4a272572..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/telecom_metrics_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "telecom_metrics_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/telecom_resolve_hidden_dependencies_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/telecom_resolve_hidden_dependencies_flag_values.textproto
deleted file mode 100644
index ebf3b119..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/telecom_resolve_hidden_dependencies_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "telecom_resolve_hidden_dependencies"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/telecom_skip_log_based_on_extra_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/telecom_skip_log_based_on_extra_flag_values.textproto
deleted file mode 100644
index 89074544..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/telecom_skip_log_based_on_extra_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "telecom_skip_log_based_on_extra"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/telephony_has_default_but_telecom_does_not_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/telephony_has_default_but_telecom_does_not_flag_values.textproto
deleted file mode 100644
index 5fe3a737..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/telephony_has_default_but_telecom_does_not_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "telephony_has_default_but_telecom_does_not"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/transactional_cs_verifier_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/transactional_cs_verifier_flag_values.textproto
deleted file mode 100644
index 4a88ac8b..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/transactional_cs_verifier_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "transactional_cs_verifier"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/transactional_hold_disconnects_unholdable_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/transactional_hold_disconnects_unholdable_flag_values.textproto
deleted file mode 100644
index f3b0e795..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/transactional_hold_disconnects_unholdable_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "transactional_hold_disconnects_unholdable"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/transactional_video_state_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/transactional_video_state_flag_values.textproto
deleted file mode 100644
index 1a88f0d8..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/transactional_video_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "transactional_video_state"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/transit_route_before_audio_disconnect_bt_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/transit_route_before_audio_disconnect_bt_flag_values.textproto
deleted file mode 100644
index 23f680ab..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/transit_route_before_audio_disconnect_bt_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "transit_route_before_audio_disconnect_bt"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/unregister_unresolvable_accounts_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/unregister_unresolvable_accounts_flag_values.textproto
deleted file mode 100644
index 184d7708..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/unregister_unresolvable_accounts_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "unregister_unresolvable_accounts"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/update_preferred_audio_device_logic_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/update_preferred_audio_device_logic_flag_values.textproto
deleted file mode 100644
index 80b1133a..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/update_preferred_audio_device_logic_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "update_preferred_audio_device_logic"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/update_route_mask_when_bt_connected_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/update_route_mask_when_bt_connected_flag_values.textproto
deleted file mode 100644
index a0c527af..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/update_route_mask_when_bt_connected_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "update_route_mask_when_bt_connected"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/updated_rcs_call_count_tracking_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/updated_rcs_call_count_tracking_flag_values.textproto
deleted file mode 100644
index ac664f15..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/updated_rcs_call_count_tracking_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "updated_rcs_call_count_tracking"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/use_actual_address_to_enter_connecting_state_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/use_actual_address_to_enter_connecting_state_flag_values.textproto
deleted file mode 100644
index eb09b0e0..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/use_actual_address_to_enter_connecting_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "use_actual_address_to_enter_connecting_state"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/use_device_provided_serialized_ringer_vibration_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/use_device_provided_serialized_ringer_vibration_flag_values.textproto
deleted file mode 100644
index 62488e04..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/use_device_provided_serialized_ringer_vibration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "use_device_provided_serialized_ringer_vibration"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/use_improved_listener_order_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/use_improved_listener_order_flag_values.textproto
deleted file mode 100644
index 581faa9a..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/use_improved_listener_order_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "use_improved_listener_order"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/use_refactored_audio_route_switching_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/use_refactored_audio_route_switching_flag_values.textproto
deleted file mode 100644
index e03c774f..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/use_refactored_audio_route_switching_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "use_refactored_audio_route_switching"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/use_stream_voice_call_tones_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/use_stream_voice_call_tones_flag_values.textproto
deleted file mode 100644
index e4e32fbb..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/use_stream_voice_call_tones_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "use_stream_voice_call_tones"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/voip_app_actions_support_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/voip_app_actions_support_flag_values.textproto
deleted file mode 100644
index 9ed617eb..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/voip_app_actions_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "voip_app_actions_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/voip_call_monitor_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/voip_call_monitor_refactor_flag_values.textproto
deleted file mode 100644
index bfadf25c..00000000
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/voip_call_monitor_refactor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.telecom.flags"
-  name: "voip_call_monitor_refactor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.updates/Android.bp b/aconfig/trunk_staging/com.android.server.updates/Android.bp
deleted file mode 100644
index 06e1ebf6..00000000
--- a/aconfig/trunk_staging/com.android.server.updates/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.updates-all",
-  package: "com.android.server.updates",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.server.updates/certificate_transparency_installer_flag_values.textproto b/aconfig/trunk_staging/com.android.server.updates/certificate_transparency_installer_flag_values.textproto
deleted file mode 100644
index b0dac92e..00000000
--- a/aconfig/trunk_staging/com.android.server.updates/certificate_transparency_installer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.updates"
-  name: "certificate_transparency_installer"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.usage/Android.bp b/aconfig/trunk_staging/com.android.server.usage/Android.bp
deleted file mode 100644
index 6da611a5..00000000
--- a/aconfig/trunk_staging/com.android.server.usage/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.usage-all",
-    package: "com.android.server.usage",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.server.usage/adjust_default_bucket_elevation_params_flag_values.textproto b/aconfig/trunk_staging/com.android.server.usage/adjust_default_bucket_elevation_params_flag_values.textproto
deleted file mode 100644
index 0a7003a3..00000000
--- a/aconfig/trunk_staging/com.android.server.usage/adjust_default_bucket_elevation_params_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.usage"
-  name: "adjust_default_bucket_elevation_params"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.usage/avoid_idle_check_flag_values.textproto b/aconfig/trunk_staging/com.android.server.usage/avoid_idle_check_flag_values.textproto
deleted file mode 100644
index 5569a41a..00000000
--- a/aconfig/trunk_staging/com.android.server.usage/avoid_idle_check_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.usage"
-  name: "avoid_idle_check"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.usage/persist_restore_to_rare_apps_list_flag_values.textproto b/aconfig/trunk_staging/com.android.server.usage/persist_restore_to_rare_apps_list_flag_values.textproto
deleted file mode 100644
index b9a01388..00000000
--- a/aconfig/trunk_staging/com.android.server.usage/persist_restore_to_rare_apps_list_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.usage"
-  name: "persist_restore_to_rare_apps_list"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.usage/screen_time_bypass_flag_values.textproto b/aconfig/trunk_staging/com.android.server.usage/screen_time_bypass_flag_values.textproto
deleted file mode 100644
index 43e3589e..00000000
--- a/aconfig/trunk_staging/com.android.server.usage/screen_time_bypass_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.usage"
-  name: "screen_time_bypass"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.usb.flags/Android.bp b/aconfig/trunk_staging/com.android.server.usb.flags/Android.bp
deleted file mode 100644
index aaad53dd..00000000
--- a/aconfig/trunk_staging/com.android.server.usb.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.usb.flags-all",
-    package: "com.android.server.usb.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.server.usb.flags/allow_restriction_of_overlay_activities_flag_values.textproto b/aconfig/trunk_staging/com.android.server.usb.flags/allow_restriction_of_overlay_activities_flag_values.textproto
deleted file mode 100644
index be2dc580..00000000
--- a/aconfig/trunk_staging/com.android.server.usb.flags/allow_restriction_of_overlay_activities_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.usb.flags"
-  name: "allow_restriction_of_overlay_activities"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.usb.flags/check_user_action_unlocked_flag_values.textproto b/aconfig/trunk_staging/com.android.server.usb.flags/check_user_action_unlocked_flag_values.textproto
deleted file mode 100644
index f00f05f0..00000000
--- a/aconfig/trunk_staging/com.android.server.usb.flags/check_user_action_unlocked_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.usb.flags"
-  name: "check_user_action_unlocked"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.usb.flags/enable_bind_to_mtp_service_flag_values.textproto b/aconfig/trunk_staging/com.android.server.usb.flags/enable_bind_to_mtp_service_flag_values.textproto
deleted file mode 100644
index 9a8865dc..00000000
--- a/aconfig/trunk_staging/com.android.server.usb.flags/enable_bind_to_mtp_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.usb.flags"
-  name: "enable_bind_to_mtp_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.usb.flags/maximize_usb_audio_volume_when_connecting_flag_values.textproto b/aconfig/trunk_staging/com.android.server.usb.flags/maximize_usb_audio_volume_when_connecting_flag_values.textproto
deleted file mode 100644
index 82abf9b3..00000000
--- a/aconfig/trunk_staging/com.android.server.usb.flags/maximize_usb_audio_volume_when_connecting_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.usb.flags"
-  name: "maximize_usb_audio_volume_when_connecting"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.utils/Android.bp b/aconfig/trunk_staging/com.android.server.utils/Android.bp
deleted file mode 100644
index ae574c29..00000000
--- a/aconfig/trunk_staging/com.android.server.utils/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.utils-all",
-    package: "com.android.server.utils",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.server.utils/anr_timer_freezer_flag_values.textproto b/aconfig/trunk_staging/com.android.server.utils/anr_timer_freezer_flag_values.textproto
deleted file mode 100644
index 9d114102..00000000
--- a/aconfig/trunk_staging/com.android.server.utils/anr_timer_freezer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.utils"
-  name: "anr_timer_freezer"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.utils/anr_timer_service_flag_values.textproto b/aconfig/trunk_staging/com.android.server.utils/anr_timer_service_flag_values.textproto
deleted file mode 100644
index b9ba8336..00000000
--- a/aconfig/trunk_staging/com.android.server.utils/anr_timer_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.utils"
-  name: "anr_timer_service"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.utils/anr_timer_trace_flag_values.textproto b/aconfig/trunk_staging/com.android.server.utils/anr_timer_trace_flag_values.textproto
deleted file mode 100644
index 7b375ae4..00000000
--- a/aconfig/trunk_staging/com.android.server.utils/anr_timer_trace_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.utils"
-  name: "anr_timer_trace"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.settings.accessibility/Android.bp b/aconfig/trunk_staging/com.android.settings.accessibility/Android.bp
deleted file mode 100644
index 8e5e657b..00000000
--- a/aconfig/trunk_staging/com.android.settings.accessibility/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.settings.accessibility-all",
-    package: "com.android.settings.accessibility",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.settings.accessibility/add_brightness_settings_in_suw_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.accessibility/add_brightness_settings_in_suw_flag_values.textproto
deleted file mode 100644
index 81a3ea04..00000000
--- a/aconfig/trunk_staging/com.android.settings.accessibility/add_brightness_settings_in_suw_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.accessibility"
-  name: "add_brightness_settings_in_suw"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.accessibility/audio_balance_state_description_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.accessibility/audio_balance_state_description_flag_values.textproto
deleted file mode 100644
index 69f7bc98..00000000
--- a/aconfig/trunk_staging/com.android.settings.accessibility/audio_balance_state_description_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.accessibility"
-  name: "audio_balance_state_description"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.accessibility/check_prebundled_is_preinstalled_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.accessibility/check_prebundled_is_preinstalled_flag_values.textproto
deleted file mode 100644
index 5bea1328..00000000
--- a/aconfig/trunk_staging/com.android.settings.accessibility/check_prebundled_is_preinstalled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.accessibility"
-  name: "check_prebundled_is_preinstalled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.accessibility/edit_shortcuts_in_full_screen_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.accessibility/edit_shortcuts_in_full_screen_flag_values.textproto
deleted file mode 100644
index 43cfb5a2..00000000
--- a/aconfig/trunk_staging/com.android.settings.accessibility/edit_shortcuts_in_full_screen_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.accessibility"
-  name: "edit_shortcuts_in_full_screen"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.accessibility/enable_color_contrast_control_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.accessibility/enable_color_contrast_control_flag_values.textproto
deleted file mode 100644
index 01fa2fa8..00000000
--- a/aconfig/trunk_staging/com.android.settings.accessibility/enable_color_contrast_control_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.accessibility"
-  name: "enable_color_contrast_control"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.accessibility/enable_hearing_aid_preset_control_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.accessibility/enable_hearing_aid_preset_control_flag_values.textproto
deleted file mode 100644
index 9cf8811b..00000000
--- a/aconfig/trunk_staging/com.android.settings.accessibility/enable_hearing_aid_preset_control_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.accessibility"
-  name: "enable_hearing_aid_preset_control"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.accessibility/enable_hearing_aid_volume_offset_control_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.accessibility/enable_hearing_aid_volume_offset_control_flag_values.textproto
deleted file mode 100644
index 245350dc..00000000
--- a/aconfig/trunk_staging/com.android.settings.accessibility/enable_hearing_aid_volume_offset_control_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.accessibility"
-  name: "enable_hearing_aid_volume_offset_control"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.accessibility/fix_a11y_settings_search_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.accessibility/fix_a11y_settings_search_flag_values.textproto
deleted file mode 100644
index dacfb66b..00000000
--- a/aconfig/trunk_staging/com.android.settings.accessibility/fix_a11y_settings_search_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.accessibility"
-  name: "fix_a11y_settings_search"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.accessibility/hide_magnification_always_on_toggle_when_window_mode_only_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.accessibility/hide_magnification_always_on_toggle_when_window_mode_only_flag_values.textproto
deleted file mode 100644
index fb9503e9..00000000
--- a/aconfig/trunk_staging/com.android.settings.accessibility/hide_magnification_always_on_toggle_when_window_mode_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.accessibility"
-  name: "hide_magnification_always_on_toggle_when_window_mode_only"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.accessibility/never_restrict_accessibility_activity_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.accessibility/never_restrict_accessibility_activity_flag_values.textproto
deleted file mode 100644
index 4093d40e..00000000
--- a/aconfig/trunk_staging/com.android.settings.accessibility/never_restrict_accessibility_activity_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.accessibility"
-  name: "never_restrict_accessibility_activity"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.accessibility/remove_qs_tooltip_in_suw_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.accessibility/remove_qs_tooltip_in_suw_flag_values.textproto
deleted file mode 100644
index b863c49c..00000000
--- a/aconfig/trunk_staging/com.android.settings.accessibility/remove_qs_tooltip_in_suw_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.accessibility"
-  name: "remove_qs_tooltip_in_suw"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.accessibility/toggle_feature_fragment_collection_info_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.accessibility/toggle_feature_fragment_collection_info_flag_values.textproto
deleted file mode 100644
index 36f7b1e7..00000000
--- a/aconfig/trunk_staging/com.android.settings.accessibility/toggle_feature_fragment_collection_info_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.accessibility"
-  name: "toggle_feature_fragment_collection_info"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.connecteddevice.flags/Android.bp b/aconfig/trunk_staging/com.android.settings.connecteddevice.flags/Android.bp
deleted file mode 100644
index 023eff19..00000000
--- a/aconfig/trunk_staging/com.android.settings.connecteddevice.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.settings.connecteddevice.flags-all",
-  package: "com.android.settings.connecteddevice.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.settings.development/Android.bp b/aconfig/trunk_staging/com.android.settings.development/Android.bp
deleted file mode 100644
index 0bb7b80c..00000000
--- a/aconfig/trunk_staging/com.android.settings.development/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.settings.development-all",
-  package: "com.android.settings.development",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.settings.development/a2dp_offload_codec_extensibility_settings_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.development/a2dp_offload_codec_extensibility_settings_flag_values.textproto
deleted file mode 100644
index 3480d80e..00000000
--- a/aconfig/trunk_staging/com.android.settings.development/a2dp_offload_codec_extensibility_settings_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.development"
-  name: "a2dp_offload_codec_extensibility_settings"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.development/deprecate_list_activity_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.development/deprecate_list_activity_flag_values.textproto
deleted file mode 100644
index b5ad4860..00000000
--- a/aconfig/trunk_staging/com.android.settings.development/deprecate_list_activity_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.development"
-  name: "deprecate_list_activity"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.factory_reset/Android.bp b/aconfig/trunk_staging/com.android.settings.factory_reset/Android.bp
deleted file mode 100644
index afd6f030..00000000
--- a/aconfig/trunk_staging/com.android.settings.factory_reset/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.settings.factory_reset-all",
-  package: "com.android.settings.factory_reset",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.settings.factory_reset/enable_factory_reset_wizard_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.factory_reset/enable_factory_reset_wizard_flag_values.textproto
deleted file mode 100644
index 6afd53f7..00000000
--- a/aconfig/trunk_staging/com.android.settings.factory_reset/enable_factory_reset_wizard_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.factory_reset"
-  name: "enable_factory_reset_wizard"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/Android.bp b/aconfig/trunk_staging/com.android.settings.flags/Android.bp
deleted file mode 100644
index 25ec916b..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.settings.flags-all",
-    package: "com.android.settings.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/accessibility_appearance_settings_backup_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/accessibility_appearance_settings_backup_enabled_flag_values.textproto
deleted file mode 100644
index 2a7fbc3a..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/accessibility_appearance_settings_backup_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "accessibility_appearance_settings_backup_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/accessibility_customize_text_reading_preview_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/accessibility_customize_text_reading_preview_flag_values.textproto
deleted file mode 100644
index 78dbc60a..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/accessibility_customize_text_reading_preview_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "accessibility_customize_text_reading_preview"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/accessibility_show_app_info_button_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/accessibility_show_app_info_button_flag_values.textproto
deleted file mode 100644
index 57e0b352..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/accessibility_show_app_info_button_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "accessibility_show_app_info_button"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/active_unlock_finish_parent_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/active_unlock_finish_parent_flag_values.textproto
deleted file mode 100644
index 43237a95..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/active_unlock_finish_parent_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "active_unlock_finish_parent"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/add_security_algorithms_to_eng_menu_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/add_security_algorithms_to_eng_menu_flag_values.textproto
deleted file mode 100644
index 1a4335bc..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/add_security_algorithms_to_eng_menu_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "add_security_algorithms_to_eng_menu"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/app_archiving_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/app_archiving_flag_values.textproto
deleted file mode 100644
index 6a4751cc..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/app_archiving_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "app_archiving"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/biometric_onboarding_education_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/biometric_onboarding_education_flag_values.textproto
deleted file mode 100644
index 90a0d2d3..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/biometric_onboarding_education_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "biometric_onboarding_education"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/biometric_settings_provider_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/biometric_settings_provider_flag_values.textproto
deleted file mode 100644
index b05ef429..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/biometric_settings_provider_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "biometric_settings_provider"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/biometrics_onboarding_education_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/biometrics_onboarding_education_flag_values.textproto
deleted file mode 100644
index ec8ed630..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/biometrics_onboarding_education_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "biometrics_onboarding_education"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_accessibility_color_and_motion_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_accessibility_color_and_motion_flag_values.textproto
deleted file mode 100644
index 611b0d1b..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_accessibility_color_and_motion_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_accessibility_color_and_motion"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_adaptive_connectivity_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_adaptive_connectivity_flag_values.textproto
deleted file mode 100644
index 28efd732..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_adaptive_connectivity_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_adaptive_connectivity"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_battery_saver_screen_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_battery_saver_screen_flag_values.textproto
deleted file mode 100644
index c05c2b98..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_battery_saver_screen_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_battery_saver_screen"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_bluetooth_switchbar_screen_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_bluetooth_switchbar_screen_flag_values.textproto
deleted file mode 100644
index 4c74aef9..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_bluetooth_switchbar_screen_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_bluetooth_switchbar_screen"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_display_settings_screen_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_display_settings_screen_flag_values.textproto
deleted file mode 100644
index c26a7b0f..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_display_settings_screen_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_display_settings_screen"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_firmware_version_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_firmware_version_flag_values.textproto
deleted file mode 100644
index 87a7501a..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_firmware_version_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_firmware_version"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_flag_values.textproto
deleted file mode 100644
index 79e3406c..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_internet_settings_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_internet_settings_flag_values.textproto
deleted file mode 100644
index 63b4801e..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_internet_settings_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_internet_settings"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_legal_information_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_legal_information_flag_values.textproto
deleted file mode 100644
index efa22a34..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_legal_information_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_legal_information"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_location_settings_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_location_settings_flag_values.textproto
deleted file mode 100644
index 1d170ea9..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_location_settings_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_location_settings"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_lockscreen_from_display_settings_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_lockscreen_from_display_settings_flag_values.textproto
deleted file mode 100644
index 9367b63d..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_lockscreen_from_display_settings_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_lockscreen_from_display_settings"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_media_controls_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_media_controls_flag_values.textproto
deleted file mode 100644
index 9ada9275..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_media_controls_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_media_controls"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_mobile_network_list_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_mobile_network_list_flag_values.textproto
deleted file mode 100644
index a5ad379a..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_mobile_network_list_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_mobile_network_list"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_my_device_info_pref_screen_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_my_device_info_pref_screen_flag_values.textproto
deleted file mode 100644
index 8ae2c0cb..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_my_device_info_pref_screen_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_my_device_info_pref_screen"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_network_provider_and_internet_screen_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_network_provider_and_internet_screen_flag_values.textproto
deleted file mode 100644
index ed490a3d..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_network_provider_and_internet_screen_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_network_provider_and_internet_screen"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_power_usage_summary_screen_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_power_usage_summary_screen_flag_values.textproto
deleted file mode 100644
index 36088697..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_power_usage_summary_screen_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_power_usage_summary_screen"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_restrict_background_parent_entry_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_restrict_background_parent_entry_flag_values.textproto
deleted file mode 100644
index 7d61d160..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_restrict_background_parent_entry_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_restrict_background_parent_entry"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_screen_timeout_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_screen_timeout_flag_values.textproto
deleted file mode 100644
index f76d03b2..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_screen_timeout_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_screen_timeout"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_service_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_service_flag_values.textproto
deleted file mode 100644
index 6e878aac..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_sound_screen_25q3_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_sound_screen_25q3_flag_values.textproto
deleted file mode 100644
index 3beff20b..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_sound_screen_25q3_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_sound_screen_25q3"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_sound_screen_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_sound_screen_flag_values.textproto
deleted file mode 100644
index 407531b3..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_sound_screen_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_sound_screen"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_spatial_audio_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_spatial_audio_flag_values.textproto
deleted file mode 100644
index 4b5b1386..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_spatial_audio_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_spatial_audio"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_tether_settings_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_tether_settings_flag_values.textproto
deleted file mode 100644
index 60ae8b0c..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_tether_settings_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_tether_settings"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_text_reading_screen_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_text_reading_screen_flag_values.textproto
deleted file mode 100644
index e7038a7e..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_text_reading_screen_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_text_reading_screen"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_vibration_intensity_screen_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_vibration_intensity_screen_flag_values.textproto
deleted file mode 100644
index ca68a206..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_vibration_intensity_screen_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_vibration_intensity_screen"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_vibration_screen_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_vibration_screen_flag_values.textproto
deleted file mode 100644
index ecf7a8f3..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_vibration_screen_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_vibration_screen"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_wifi_calling_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_wifi_calling_flag_values.textproto
deleted file mode 100644
index 9043e79a..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/catalyst_wifi_calling_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "catalyst_wifi_calling"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/datetime_feedback_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/datetime_feedback_flag_values.textproto
deleted file mode 100644
index 0465c8e8..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/datetime_feedback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "datetime_feedback"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/dedupe_dnd_settings_channels_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/dedupe_dnd_settings_channels_flag_values.textproto
deleted file mode 100644
index 8bfecbd6..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/dedupe_dnd_settings_channels_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "dedupe_dnd_settings_channels"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/development_game_default_frame_rate_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/development_game_default_frame_rate_flag_values.textproto
deleted file mode 100644
index 5d708510..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/development_game_default_frame_rate_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "development_game_default_frame_rate"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/development_hdr_sdr_ratio_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/development_hdr_sdr_ratio_flag_values.textproto
deleted file mode 100644
index b861ee27..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/development_hdr_sdr_ratio_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "development_hdr_sdr_ratio"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/disable_bonding_cancellation_for_orientation_change_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/disable_bonding_cancellation_for_orientation_change_flag_values.textproto
deleted file mode 100644
index 6f38eb39..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/disable_bonding_cancellation_for_orientation_change_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "disable_bonding_cancellation_for_orientation_change"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/display_size_connected_display_setting_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/display_size_connected_display_setting_flag_values.textproto
deleted file mode 100644
index 99568e71..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/display_size_connected_display_setting_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "display_size_connected_display_setting"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/display_topology_pane_in_display_list_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/display_topology_pane_in_display_list_flag_values.textproto
deleted file mode 100644
index 2c3ac9f7..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/display_topology_pane_in_display_list_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "display_topology_pane_in_display_list"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/dynamic_injection_category_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/dynamic_injection_category_flag_values.textproto
deleted file mode 100644
index abd6397c..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/dynamic_injection_category_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "dynamic_injection_category"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/enable_auth_challenge_for_usb_preferences_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/enable_auth_challenge_for_usb_preferences_flag_values.textproto
deleted file mode 100644
index c433089e..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/enable_auth_challenge_for_usb_preferences_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "enable_auth_challenge_for_usb_preferences"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/enable_battery_level_display_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/enable_battery_level_display_flag_values.textproto
deleted file mode 100644
index 0f82bd51..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/enable_battery_level_display_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "enable_battery_level_display"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/enable_bluetooth_device_details_polish_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/enable_bluetooth_device_details_polish_flag_values.textproto
deleted file mode 100644
index 718963f5..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/enable_bluetooth_device_details_polish_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "enable_bluetooth_device_details_polish"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/enable_bluetooth_key_missing_dialog_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/enable_bluetooth_key_missing_dialog_flag_values.textproto
deleted file mode 100644
index a09ce63a..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/enable_bluetooth_key_missing_dialog_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "enable_bluetooth_key_missing_dialog"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/enable_bluetooth_profile_toggle_visibility_checker_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/enable_bluetooth_profile_toggle_visibility_checker_flag_values.textproto
deleted file mode 100644
index df9bd222..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/enable_bluetooth_profile_toggle_visibility_checker_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "enable_bluetooth_profile_toggle_visibility_checker"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/enable_bonded_bluetooth_device_searchable_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/enable_bonded_bluetooth_device_searchable_flag_values.textproto
deleted file mode 100644
index 4a866f1f..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/enable_bonded_bluetooth_device_searchable_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "enable_bonded_bluetooth_device_searchable"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/enable_device_diagnostics_in_settings_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/enable_device_diagnostics_in_settings_flag_values.textproto
deleted file mode 100644
index ec24a752..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/enable_device_diagnostics_in_settings_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "enable_device_diagnostics_in_settings"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/enable_hub_mode_settings_on_mobile_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/enable_hub_mode_settings_on_mobile_flag_values.textproto
deleted file mode 100644
index 9a5132e9..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/enable_hub_mode_settings_on_mobile_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "enable_hub_mode_settings_on_mobile"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/enable_remove_association_bt_unpair_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/enable_remove_association_bt_unpair_flag_values.textproto
deleted file mode 100644
index 37880f0a..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/enable_remove_association_bt_unpair_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "enable_remove_association_bt_unpair"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/enable_sound_backup_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/enable_sound_backup_flag_values.textproto
deleted file mode 100644
index c813458b..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/enable_sound_backup_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "enable_sound_backup"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/enable_subsequent_pair_settings_integration_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/enable_subsequent_pair_settings_integration_flag_values.textproto
deleted file mode 100644
index 9fcf560e..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/enable_subsequent_pair_settings_integration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "enable_subsequent_pair_settings_integration"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/enable_wifi_sharing_runtime_fragment_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/enable_wifi_sharing_runtime_fragment_flag_values.textproto
deleted file mode 100644
index b2f38790..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/enable_wifi_sharing_runtime_fragment_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "enable_wifi_sharing_runtime_fragment"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/enroll_layout_truncate_improvement_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/enroll_layout_truncate_improvement_flag_values.textproto
deleted file mode 100644
index f5d5766d..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/enroll_layout_truncate_improvement_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "enroll_layout_truncate_improvement"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/exclude_webcam_auth_challenge_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/exclude_webcam_auth_challenge_flag_values.textproto
deleted file mode 100644
index eaa8d983..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/exclude_webcam_auth_challenge_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "exclude_webcam_auth_challenge"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/extended_screenshots_exclude_nested_scrollables_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/extended_screenshots_exclude_nested_scrollables_flag_values.textproto
deleted file mode 100644
index 89998c2f..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/extended_screenshots_exclude_nested_scrollables_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "extended_screenshots_exclude_nested_scrollables"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/hide_le_audio_toggle_for_le_audio_only_device_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/hide_le_audio_toggle_for_le_audio_only_device_flag_values.textproto
deleted file mode 100644
index 8fe29497..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/hide_le_audio_toggle_for_le_audio_only_device_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "hide_le_audio_toggle_for_le_audio_only_device"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/homepage_revamp_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/homepage_revamp_flag_values.textproto
deleted file mode 100644
index bc78c0e9..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/homepage_revamp_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "homepage_revamp"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/internet_preference_controller_v2_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/internet_preference_controller_v2_flag_values.textproto
deleted file mode 100644
index 34d69472..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/internet_preference_controller_v2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "internet_preference_controller_v2"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/is_dual_sim_onboarding_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/is_dual_sim_onboarding_enabled_flag_values.textproto
deleted file mode 100644
index 4884f0c2..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/is_dual_sim_onboarding_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "is_dual_sim_onboarding_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/locale_notification_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/locale_notification_enabled_flag_values.textproto
deleted file mode 100644
index bb03141c..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/locale_notification_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "locale_notification_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/mainline_module_explicit_intent_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/mainline_module_explicit_intent_flag_values.textproto
deleted file mode 100644
index 3ceefadd..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/mainline_module_explicit_intent_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "mainline_module_explicit_intent"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/mobile_network_security_2g_toggle_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/mobile_network_security_2g_toggle_flag_values.textproto
deleted file mode 100644
index 1b2f0c25..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/mobile_network_security_2g_toggle_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "mobile_network_security_2g_toggle"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/new_apn_page_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/new_apn_page_enabled_flag_values.textproto
deleted file mode 100644
index 3d3353fb..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/new_apn_page_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "new_apn_page_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/new_hearing_device_pairing_page_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/new_hearing_device_pairing_page_flag_values.textproto
deleted file mode 100644
index a18571f6..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/new_hearing_device_pairing_page_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "new_hearing_device_pairing_page"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/page_size_app_compat_setting_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/page_size_app_compat_setting_flag_values.textproto
deleted file mode 100644
index e5833a15..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/page_size_app_compat_setting_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "page_size_app_compat_setting"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/protect_lock_after_timeout_with_auth_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/protect_lock_after_timeout_with_auth_flag_values.textproto
deleted file mode 100644
index 0b92a4f3..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/protect_lock_after_timeout_with_auth_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "protect_lock_after_timeout_with_auth"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/protect_screen_timeout_with_auth_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/protect_screen_timeout_with_auth_flag_values.textproto
deleted file mode 100644
index eedd284f..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/protect_screen_timeout_with_auth_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "protect_screen_timeout_with_auth"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/regional_preferences_api_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/regional_preferences_api_enabled_flag_values.textproto
deleted file mode 100644
index 19e2742f..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/regional_preferences_api_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "regional_preferences_api_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/remove_key_hide_enable_2g_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/remove_key_hide_enable_2g_flag_values.textproto
deleted file mode 100644
index 54417927..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/remove_key_hide_enable_2g_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "remove_key_hide_enable_2g"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/resolution_and_enable_connected_display_setting_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/resolution_and_enable_connected_display_setting_flag_values.textproto
deleted file mode 100644
index 4d613b83..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/resolution_and_enable_connected_display_setting_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "resolution_and_enable_connected_display_setting"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/revamp_toggles_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/revamp_toggles_flag_values.textproto
deleted file mode 100644
index 2b55de79..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/revamp_toggles_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "revamp_toggles"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/rotation_connected_display_setting_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/rotation_connected_display_setting_flag_values.textproto
deleted file mode 100644
index 80eaae91..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/rotation_connected_display_setting_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "rotation_connected_display_setting"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/satellite_oem_settings_ux_migration_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/satellite_oem_settings_ux_migration_flag_values.textproto
deleted file mode 100644
index 70d12871..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/satellite_oem_settings_ux_migration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "satellite_oem_settings_ux_migration"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/screen_off_unlock_power_optimization_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/screen_off_unlock_power_optimization_flag_values.textproto
deleted file mode 100644
index 75263a67..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/screen_off_unlock_power_optimization_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "screen_off_unlock_power_optimization"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/separate_accessibility_vibration_settings_fragments_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/separate_accessibility_vibration_settings_fragments_flag_values.textproto
deleted file mode 100644
index 80d45bd5..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/separate_accessibility_vibration_settings_fragments_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "separate_accessibility_vibration_settings_fragments"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/sfps_enroll_refinement_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/sfps_enroll_refinement_flag_values.textproto
deleted file mode 100644
index c33ae57d..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/sfps_enroll_refinement_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "sfps_enroll_refinement"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/show_factory_reset_cancel_button_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/show_factory_reset_cancel_button_flag_values.textproto
deleted file mode 100644
index 0c09c1cc..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/show_factory_reset_cancel_button_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "show_factory_reset_cancel_button"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/support_raw_dynamic_icons_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/support_raw_dynamic_icons_flag_values.textproto
deleted file mode 100644
index 7070bdc5..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/support_raw_dynamic_icons_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "support_raw_dynamic_icons"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/terms_of_address_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/terms_of_address_enabled_flag_values.textproto
deleted file mode 100644
index a9f19b32..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/terms_of_address_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "terms_of_address_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/thread_settings_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/thread_settings_enabled_flag_values.textproto
deleted file mode 100644
index ee8040bb..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/thread_settings_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "thread_settings_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/udfps_enroll_calibration_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/udfps_enroll_calibration_flag_values.textproto
deleted file mode 100644
index 33ec9cda..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/udfps_enroll_calibration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "udfps_enroll_calibration"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/utils_return_user_handle_for_current_user_id_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/utils_return_user_handle_for_current_user_id_flag_values.textproto
deleted file mode 100644
index 1d5aa886..00000000
--- a/aconfig/trunk_staging/com.android.settings.flags/utils_return_user_handle_for_current_user_id_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "utils_return_user_handle_for_current_user_id"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.keyboard/Android.bp b/aconfig/trunk_staging/com.android.settings.keyboard/Android.bp
deleted file mode 100644
index 73db252b..00000000
--- a/aconfig/trunk_staging/com.android.settings.keyboard/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.settings.keyboard-all",
-    package: "com.android.settings.keyboard",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.settings.keyboard/keyboard_and_touchpad_a11y_new_page_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.keyboard/keyboard_and_touchpad_a11y_new_page_enabled_flag_values.textproto
deleted file mode 100644
index 72914c2e..00000000
--- a/aconfig/trunk_staging/com.android.settings.keyboard/keyboard_and_touchpad_a11y_new_page_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.keyboard"
-  name: "keyboard_and_touchpad_a11y_new_page_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.media_drm/Android.bp b/aconfig/trunk_staging/com.android.settings.media_drm/Android.bp
deleted file mode 100644
index 476eba28..00000000
--- a/aconfig/trunk_staging/com.android.settings.media_drm/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.settings.media_drm-all",
-  package: "com.android.settings.media_drm",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.settings.media_drm/force_l3_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.media_drm/force_l3_enabled_flag_values.textproto
deleted file mode 100644
index a6b1bb74..00000000
--- a/aconfig/trunk_staging/com.android.settings.media_drm/force_l3_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.media_drm"
-  name: "force_l3_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/Android.bp b/aconfig/trunk_staging/com.android.settingslib.flags/Android.bp
deleted file mode 100644
index 6126e13b..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.settingslib.flags-all",
-    package: "com.android.settingslib.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/adopt_primary_group_management_api_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/adopt_primary_group_management_api_flag_values.textproto
deleted file mode 100644
index 87a9b0d6..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/adopt_primary_group_management_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "adopt_primary_group_management_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/asha_profile_access_profile_enabled_true_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/asha_profile_access_profile_enabled_true_flag_values.textproto
deleted file mode 100644
index dde036c8..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/asha_profile_access_profile_enabled_true_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "asha_profile_access_profile_enabled_true"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/audio_sharing_developer_option_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/audio_sharing_developer_option_flag_values.textproto
deleted file mode 100644
index 24ca4e99..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/audio_sharing_developer_option_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "audio_sharing_developer_option"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/audio_sharing_hysteresis_mode_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/audio_sharing_hysteresis_mode_fix_flag_values.textproto
deleted file mode 100644
index e2703253..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/audio_sharing_hysteresis_mode_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "audio_sharing_hysteresis_mode_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/audio_sharing_qs_dialog_improvement_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/audio_sharing_qs_dialog_improvement_flag_values.textproto
deleted file mode 100644
index b50ece13..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/audio_sharing_qs_dialog_improvement_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "audio_sharing_qs_dialog_improvement"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/disable_audio_sharing_auto_pick_fallback_in_ui_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/disable_audio_sharing_auto_pick_fallback_in_ui_flag_values.textproto
deleted file mode 100644
index 00c7b069..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/disable_audio_sharing_auto_pick_fallback_in_ui_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "disable_audio_sharing_auto_pick_fallback_in_ui"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/enable_cached_bluetooth_device_dedup_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/enable_cached_bluetooth_device_dedup_flag_values.textproto
deleted file mode 100644
index 518035e5..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/enable_cached_bluetooth_device_dedup_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "enable_cached_bluetooth_device_dedup"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/enable_determining_advanced_details_header_with_metadata_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/enable_determining_advanced_details_header_with_metadata_flag_values.textproto
deleted file mode 100644
index 9dbce64b..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/enable_determining_advanced_details_header_with_metadata_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "enable_determining_advanced_details_header_with_metadata"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/enable_determining_spatial_audio_attributes_by_profile_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/enable_determining_spatial_audio_attributes_by_profile_flag_values.textproto
deleted file mode 100644
index 936ba166..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/enable_determining_spatial_audio_attributes_by_profile_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "enable_determining_spatial_audio_attributes_by_profile"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/enable_hide_exclusively_managed_bluetooth_device_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/enable_hide_exclusively_managed_bluetooth_device_flag_values.textproto
deleted file mode 100644
index 3a00c298..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/enable_hide_exclusively_managed_bluetooth_device_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "enable_hide_exclusively_managed_bluetooth_device"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/enable_le_audio_qr_code_private_broadcast_sharing_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/enable_le_audio_qr_code_private_broadcast_sharing_flag_values.textproto
deleted file mode 100644
index f7a0a9ad..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/enable_le_audio_qr_code_private_broadcast_sharing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "enable_le_audio_qr_code_private_broadcast_sharing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/enable_le_audio_sharing_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/enable_le_audio_sharing_flag_values.textproto
deleted file mode 100644
index fd954986..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/enable_le_audio_sharing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "enable_le_audio_sharing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/enable_set_preferred_transport_for_le_audio_device_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/enable_set_preferred_transport_for_le_audio_device_flag_values.textproto
deleted file mode 100644
index 47f381ba..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/enable_set_preferred_transport_for_le_audio_device_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "enable_set_preferred_transport_for_le_audio_device"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/enable_temporary_bond_devices_ui_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/enable_temporary_bond_devices_ui_flag_values.textproto
deleted file mode 100644
index 69b83448..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/enable_temporary_bond_devices_ui_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "enable_temporary_bond_devices_ui"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/extreme_power_low_state_vulnerability_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/extreme_power_low_state_vulnerability_flag_values.textproto
deleted file mode 100644
index d0dfbc56..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/extreme_power_low_state_vulnerability_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "extreme_power_low_state_vulnerability"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/hearing_device_set_connection_status_report_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/hearing_device_set_connection_status_report_flag_values.textproto
deleted file mode 100644
index 2f458d7a..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/hearing_device_set_connection_status_report_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "hearing_device_set_connection_status_report"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/hearing_devices_ambient_volume_control_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/hearing_devices_ambient_volume_control_flag_values.textproto
deleted file mode 100644
index 2ea997c0..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/hearing_devices_ambient_volume_control_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "hearing_devices_ambient_volume_control"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/hearing_devices_input_routing_control_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/hearing_devices_input_routing_control_flag_values.textproto
deleted file mode 100644
index fa9dd457..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/hearing_devices_input_routing_control_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "hearing_devices_input_routing_control"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/ignore_a2dp_disconnection_for_android_auto_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/ignore_a2dp_disconnection_for_android_auto_flag_values.textproto
deleted file mode 100644
index 298bfadc..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/ignore_a2dp_disconnection_for_android_auto_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "ignore_a2dp_disconnection_for_android_auto"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/new_status_bar_icons_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/new_status_bar_icons_flag_values.textproto
deleted file mode 100644
index e24e4ff1..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/new_status_bar_icons_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "new_status_bar_icons"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/promote_audio_sharing_for_second_auto_connected_lea_device_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/promote_audio_sharing_for_second_auto_connected_lea_device_flag_values.textproto
deleted file mode 100644
index 510cdb96..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/promote_audio_sharing_for_second_auto_connected_lea_device_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "promote_audio_sharing_for_second_auto_connected_lea_device"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/settings_catalyst_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/settings_catalyst_flag_values.textproto
deleted file mode 100644
index 2bb61339..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/settings_catalyst_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "settings_catalyst"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/settings_preference_write_consent_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/settings_preference_write_consent_enabled_flag_values.textproto
deleted file mode 100644
index 882bfa3f..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/settings_preference_write_consent_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "settings_preference_write_consent_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/volume_dialog_audio_sharing_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/volume_dialog_audio_sharing_fix_flag_values.textproto
deleted file mode 100644
index 975fef18..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/volume_dialog_audio_sharing_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "volume_dialog_audio_sharing_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/volume_panel_broadcast_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/volume_panel_broadcast_fix_flag_values.textproto
deleted file mode 100644
index bf7d2a30..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/volume_panel_broadcast_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "volume_panel_broadcast_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/write_system_preference_permission_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/write_system_preference_permission_enabled_flag_values.textproto
deleted file mode 100644
index 50dfb826..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/write_system_preference_permission_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "write_system_preference_permission_enabled"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.media.flags/Android.bp b/aconfig/trunk_staging/com.android.settingslib.media.flags/Android.bp
deleted file mode 100644
index 8ff4691f..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.media.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.settingslib.media.flags-all",
-    package: "com.android.settingslib.media.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.media.flags/enable_output_switcher_for_system_routing_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.media.flags/enable_output_switcher_for_system_routing_flag_values.textproto
deleted file mode 100644
index 6df62119..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.media.flags/enable_output_switcher_for_system_routing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.media.flags"
-  name: "enable_output_switcher_for_system_routing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.media.flags/enable_tv_media_output_dialog_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.media.flags/enable_tv_media_output_dialog_flag_values.textproto
deleted file mode 100644
index db0abc0c..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.media.flags/enable_tv_media_output_dialog_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.media.flags"
-  name: "enable_tv_media_output_dialog"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.media.flags/remove_unnecessary_route_scanning_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.media.flags/remove_unnecessary_route_scanning_flag_values.textproto
deleted file mode 100644
index b6ba5641..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.media.flags/remove_unnecessary_route_scanning_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.media.flags"
-  name: "remove_unnecessary_route_scanning"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.media.flags/use_media_router2_for_info_media_manager_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.media.flags/use_media_router2_for_info_media_manager_flag_values.textproto
deleted file mode 100644
index 01535a2e..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.media.flags/use_media_router2_for_info_media_manager_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.media.flags"
-  name: "use_media_router2_for_info_media_manager"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.media.flags/use_playback_info_for_routing_controls_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.media.flags/use_playback_info_for_routing_controls_flag_values.textproto
deleted file mode 100644
index 94b54b9c..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.media.flags/use_playback_info_for_routing_controls_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.media.flags"
-  name: "use_playback_info_for_routing_controls"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.widget.flags/Android.bp b/aconfig/trunk_staging/com.android.settingslib.widget.flags/Android.bp
deleted file mode 100644
index 4ef8d80a..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.widget.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.settingslib.widget.flags-all",
-  package: "com.android.settingslib.widget.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.widget.flags/auto_hide_empty_lottie_res_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.widget.flags/auto_hide_empty_lottie_res_flag_values.textproto
deleted file mode 100644
index 95b2665c..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.widget.flags/auto_hide_empty_lottie_res_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.widget.flags"
-  name: "auto_hide_empty_lottie_res"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.widget.selectorwithwidgetpreference.flags/Android.bp b/aconfig/trunk_staging/com.android.settingslib.widget.selectorwithwidgetpreference.flags/Android.bp
deleted file mode 100644
index e841df81..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.widget.selectorwithwidgetpreference.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.settingslib.widget.selectorwithwidgetpreference.flags-all",
-  package: "com.android.settingslib.widget.selectorwithwidgetpreference.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.widget.selectorwithwidgetpreference.flags/allow_set_title_max_lines_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.widget.selectorwithwidgetpreference.flags/allow_set_title_max_lines_flag_values.textproto
deleted file mode 100644
index 221d9530..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.widget.selectorwithwidgetpreference.flags/allow_set_title_max_lines_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.widget.selectorwithwidgetpreference.flags"
-  name: "allow_set_title_max_lines"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.widget.theme.flags/Android.bp b/aconfig/trunk_staging/com.android.settingslib.widget.theme.flags/Android.bp
deleted file mode 100644
index d75b90e2..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.widget.theme.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.settingslib.widget.theme.flags-all",
-    package: "com.android.settingslib.widget.theme.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.widget.theme.flags/is_expressive_design_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.widget.theme.flags/is_expressive_design_enabled_flag_values.textproto
deleted file mode 100644
index ea07a8da..00000000
--- a/aconfig/trunk_staging/com.android.settingslib.widget.theme.flags/is_expressive_design_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.widget.theme.flags"
-  name: "is_expressive_design_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.shell.flags/Android.bp b/aconfig/trunk_staging/com.android.shell.flags/Android.bp
deleted file mode 100644
index 586f1aa9..00000000
--- a/aconfig/trunk_staging/com.android.shell.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.shell.flags-all",
-    package: "com.android.shell.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.shell.flags/handle_bugreports_for_wear_flag_values.textproto b/aconfig/trunk_staging/com.android.shell.flags/handle_bugreports_for_wear_flag_values.textproto
deleted file mode 100644
index 7475ae12..00000000
--- a/aconfig/trunk_staging/com.android.shell.flags/handle_bugreports_for_wear_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.shell.flags"
-  name: "handle_bugreports_for_wear"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.system.virtualmachine.flags/Android.bp b/aconfig/trunk_staging/com.android.system.virtualmachine.flags/Android.bp
deleted file mode 100644
index eece7e45..00000000
--- a/aconfig/trunk_staging/com.android.system.virtualmachine.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.system.virtualmachine.flags-all",
-    package: "com.android.system.virtualmachine.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.system.virtualmachine.flags/avf_v_test_apis_flag_values.textproto b/aconfig/trunk_staging/com.android.system.virtualmachine.flags/avf_v_test_apis_flag_values.textproto
deleted file mode 100644
index a87e3180..00000000
--- a/aconfig/trunk_staging/com.android.system.virtualmachine.flags/avf_v_test_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.system.virtualmachine.flags"
-  name: "avf_v_test_apis"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.system.virtualmachine.flags/promote_set_should_use_hugepages_to_system_api_flag_values.textproto b/aconfig/trunk_staging/com.android.system.virtualmachine.flags/promote_set_should_use_hugepages_to_system_api_flag_values.textproto
deleted file mode 100644
index 2931c75d..00000000
--- a/aconfig/trunk_staging/com.android.system.virtualmachine.flags/promote_set_should_use_hugepages_to_system_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.system.virtualmachine.flags"
-  name: "promote_set_should_use_hugepages_to_system_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.system.virtualmachine.flags/terminal_gui_support_flag_values.textproto b/aconfig/trunk_staging/com.android.system.virtualmachine.flags/terminal_gui_support_flag_values.textproto
deleted file mode 100644
index 727d3373..00000000
--- a/aconfig/trunk_staging/com.android.system.virtualmachine.flags/terminal_gui_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.system.virtualmachine.flags"
-  name: "terminal_gui_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/Android.bp b/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/Android.bp
deleted file mode 100644
index 343e187d..00000000
--- a/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.systemui.accessibility.accessibilitymenu-all",
-  package: "com.android.systemui.accessibility.accessibilitymenu",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/a11y_menu_hide_before_taking_action_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/a11y_menu_hide_before_taking_action_flag_values.textproto
deleted file mode 100644
index a55ecc06..00000000
--- a/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/a11y_menu_hide_before_taking_action_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.accessibility.accessibilitymenu"
-  name: "a11y_menu_hide_before_taking_action"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/a11y_menu_snackbar_live_region_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/a11y_menu_snackbar_live_region_flag_values.textproto
deleted file mode 100644
index 4f24942f..00000000
--- a/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/a11y_menu_snackbar_live_region_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.accessibility.accessibilitymenu"
-  name: "a11y_menu_snackbar_live_region"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/action_bar_wrap_content_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/action_bar_wrap_content_flag_values.textproto
deleted file mode 100644
index 9b3ff01b..00000000
--- a/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/action_bar_wrap_content_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.accessibility.accessibilitymenu"
-  name: "action_bar_wrap_content"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/hide_restricted_actions_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/hide_restricted_actions_flag_values.textproto
deleted file mode 100644
index b2545342..00000000
--- a/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/hide_restricted_actions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.accessibility.accessibilitymenu"
-  name: "hide_restricted_actions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.aconfig/Android.bp b/aconfig/trunk_staging/com.android.systemui.aconfig/Android.bp
deleted file mode 100644
index f6ea2426..00000000
--- a/aconfig/trunk_staging/com.android.systemui.aconfig/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.systemui.aconfig-all",
-  package: "com.android.systemui.aconfig",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.car/Android.bp b/aconfig/trunk_staging/com.android.systemui.car/Android.bp
deleted file mode 100644
index 968dec5c..00000000
--- a/aconfig/trunk_staging/com.android.systemui.car/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.systemui.car-all",
-    package: "com.android.systemui.car",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.car/auto_task_stack_windowing_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.car/auto_task_stack_windowing_flag_values.textproto
deleted file mode 100644
index 969dd53b..00000000
--- a/aconfig/trunk_staging/com.android.systemui.car/auto_task_stack_windowing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.car"
-  name: "auto_task_stack_windowing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.car/config_app_blocking_activities_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.car/config_app_blocking_activities_flag_values.textproto
deleted file mode 100644
index d917c278..00000000
--- a/aconfig/trunk_staging/com.android.systemui.car/config_app_blocking_activities_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.car"
-  name: "config_app_blocking_activities"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.car/config_aware_systemui_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.car/config_aware_systemui_flag_values.textproto
deleted file mode 100644
index 331d3406..00000000
--- a/aconfig/trunk_staging/com.android.systemui.car/config_aware_systemui_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.car"
-  name: "config_aware_systemui"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.car/example_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.car/example_flag_flag_values.textproto
deleted file mode 100644
index b44bfe2a..00000000
--- a/aconfig/trunk_staging/com.android.systemui.car/example_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.car"
-  name: "example_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.car/scalable_ui_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.car/scalable_ui_flag_values.textproto
deleted file mode 100644
index 202f8cee..00000000
--- a/aconfig/trunk_staging/com.android.systemui.car/scalable_ui_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.car"
-  name: "scalable_ui"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.car/show_qc_sound_panel_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.car/show_qc_sound_panel_flag_values.textproto
deleted file mode 100644
index 049ac4dd..00000000
--- a/aconfig/trunk_staging/com.android.systemui.car/show_qc_sound_panel_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.car"
-  name: "show_qc_sound_panel"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.car/user_switch_keyguard_shown_timeout_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.car/user_switch_keyguard_shown_timeout_flag_values.textproto
deleted file mode 100644
index 9da7207e..00000000
--- a/aconfig/trunk_staging/com.android.systemui.car/user_switch_keyguard_shown_timeout_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.car"
-  name: "user_switch_keyguard_shown_timeout"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.communal/Android.bp b/aconfig/trunk_staging/com.android.systemui.communal/Android.bp
deleted file mode 100644
index f45237d1..00000000
--- a/aconfig/trunk_staging/com.android.systemui.communal/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.systemui.communal-all",
-  package: "com.android.systemui.communal",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.shared/Android.bp b/aconfig/trunk_staging/com.android.systemui.shared/Android.bp
deleted file mode 100644
index 3e6c5563..00000000
--- a/aconfig/trunk_staging/com.android.systemui.shared/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.systemui.shared-all",
-    package: "com.android.systemui.shared",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.shared/ambient_aod_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.shared/ambient_aod_flag_values.textproto
deleted file mode 100644
index 6c74497b..00000000
--- a/aconfig/trunk_staging/com.android.systemui.shared/ambient_aod_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.shared"
-  name: "ambient_aod"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.shared/bouncer_area_exclusion_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.shared/bouncer_area_exclusion_flag_values.textproto
deleted file mode 100644
index 8dc77f7e..00000000
--- a/aconfig/trunk_staging/com.android.systemui.shared/bouncer_area_exclusion_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.shared"
-  name: "bouncer_area_exclusion"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.shared/clock_reactive_smartspace_layout_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.shared/clock_reactive_smartspace_layout_flag_values.textproto
deleted file mode 100644
index fd080d18..00000000
--- a/aconfig/trunk_staging/com.android.systemui.shared/clock_reactive_smartspace_layout_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.shared"
-  name: "clock_reactive_smartspace_layout"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.shared/clock_reactive_variants_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.shared/clock_reactive_variants_flag_values.textproto
deleted file mode 100644
index 83e8a718..00000000
--- a/aconfig/trunk_staging/com.android.systemui.shared/clock_reactive_variants_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.shared"
-  name: "clock_reactive_variants"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.shared/extended_wallpaper_effects_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.shared/extended_wallpaper_effects_flag_values.textproto
deleted file mode 100644
index 68ed1ef9..00000000
--- a/aconfig/trunk_staging/com.android.systemui.shared/extended_wallpaper_effects_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.shared"
-  name: "extended_wallpaper_effects"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.shared/lockscreen_custom_clocks_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.shared/lockscreen_custom_clocks_flag_values.textproto
deleted file mode 100644
index 852c982f..00000000
--- a/aconfig/trunk_staging/com.android.systemui.shared/lockscreen_custom_clocks_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.shared"
-  name: "lockscreen_custom_clocks"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.shared/new_customization_picker_ui_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.shared/new_customization_picker_ui_flag_values.textproto
deleted file mode 100644
index 0478d723..00000000
--- a/aconfig/trunk_staging/com.android.systemui.shared/new_customization_picker_ui_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.shared"
-  name: "new_customization_picker_ui"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.shared/new_touchpad_gestures_tutorial_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.shared/new_touchpad_gestures_tutorial_flag_values.textproto
deleted file mode 100644
index f3237f77..00000000
--- a/aconfig/trunk_staging/com.android.systemui.shared/new_touchpad_gestures_tutorial_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.shared"
-  name: "new_touchpad_gestures_tutorial"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.shared/return_animation_framework_library_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.shared/return_animation_framework_library_flag_values.textproto
deleted file mode 100644
index 1ec5dd48..00000000
--- a/aconfig/trunk_staging/com.android.systemui.shared/return_animation_framework_library_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.shared"
-  name: "return_animation_framework_library"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.shared/return_animation_framework_long_lived_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.shared/return_animation_framework_long_lived_flag_values.textproto
deleted file mode 100644
index 19f1afb9..00000000
--- a/aconfig/trunk_staging/com.android.systemui.shared/return_animation_framework_long_lived_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.shared"
-  name: "return_animation_framework_long_lived"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.shared/screenshot_context_url_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.shared/screenshot_context_url_flag_values.textproto
deleted file mode 100644
index b8341bf5..00000000
--- a/aconfig/trunk_staging/com.android.systemui.shared/screenshot_context_url_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.shared"
-  name: "screenshot_context_url"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.shared/sidefps_controller_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.shared/sidefps_controller_refactor_flag_values.textproto
deleted file mode 100644
index 3ff2c85f..00000000
--- a/aconfig/trunk_staging/com.android.systemui.shared/sidefps_controller_refactor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.shared"
-  name: "sidefps_controller_refactor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.shared/smartspace_remoteviews_intent_handler_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.shared/smartspace_remoteviews_intent_handler_flag_values.textproto
deleted file mode 100644
index b93c4d03..00000000
--- a/aconfig/trunk_staging/com.android.systemui.shared/smartspace_remoteviews_intent_handler_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.shared"
-  name: "smartspace_remoteviews_intent_handler"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui.shared/status_bar_connected_displays_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.shared/status_bar_connected_displays_flag_values.textproto
deleted file mode 100644
index 54bb9caf..00000000
--- a/aconfig/trunk_staging/com.android.systemui.shared/status_bar_connected_displays_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui.shared"
-  name: "status_bar_connected_displays"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/Android.bp b/aconfig/trunk_staging/com.android.systemui/Android.bp
deleted file mode 100644
index 63758fe8..00000000
--- a/aconfig/trunk_staging/com.android.systemui/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.systemui-all",
-    package: "com.android.systemui",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/TEST_MAPPING b/aconfig/trunk_staging/com.android.systemui/TEST_MAPPING
deleted file mode 100644
index 44ac02fa..00000000
--- a/aconfig/trunk_staging/com.android.systemui/TEST_MAPPING
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "imports": [
-    {
-      "path": "frameworks/base/packages/SystemUI"
-    },
-    {
-      "path": "frameworks/base/services/core/java/com/android/server/notification"
-    }
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/activity_transition_use_largest_window_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/activity_transition_use_largest_window_flag_values.textproto
deleted file mode 100644
index 2d4cf8de..00000000
--- a/aconfig/trunk_staging/com.android.systemui/activity_transition_use_largest_window_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "activity_transition_use_largest_window"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/add_black_background_for_window_magnifier_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/add_black_background_for_window_magnifier_flag_values.textproto
deleted file mode 100644
index fed058d2..00000000
--- a/aconfig/trunk_staging/com.android.systemui/add_black_background_for_window_magnifier_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "add_black_background_for_window_magnifier"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/always_compose_qs_ui_fragment_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/always_compose_qs_ui_fragment_flag_values.textproto
deleted file mode 100644
index fb384b9e..00000000
--- a/aconfig/trunk_staging/com.android.systemui/always_compose_qs_ui_fragment_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "always_compose_qs_ui_fragment"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/aod_ui_rich_ongoing_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/aod_ui_rich_ongoing_flag_values.textproto
deleted file mode 100644
index 9a1e2783..00000000
--- a/aconfig/trunk_staging/com.android.systemui/aod_ui_rich_ongoing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "aod_ui_rich_ongoing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/app_clips_backlinks_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/app_clips_backlinks_flag_values.textproto
deleted file mode 100644
index dcefc7a1..00000000
--- a/aconfig/trunk_staging/com.android.systemui/app_clips_backlinks_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "app_clips_backlinks"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/bind_keyguard_media_visibility_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/bind_keyguard_media_visibility_flag_values.textproto
deleted file mode 100644
index 041b2ce0..00000000
--- a/aconfig/trunk_staging/com.android.systemui/bind_keyguard_media_visibility_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "bind_keyguard_media_visibility"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/bouncer_ui_revamp_2_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/bouncer_ui_revamp_2_flag_values.textproto
deleted file mode 100644
index a930d0da..00000000
--- a/aconfig/trunk_staging/com.android.systemui/bouncer_ui_revamp_2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "bouncer_ui_revamp_2"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/bouncer_ui_revamp_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/bouncer_ui_revamp_flag_values.textproto
deleted file mode 100644
index 5d1e2b8e..00000000
--- a/aconfig/trunk_staging/com.android.systemui/bouncer_ui_revamp_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "bouncer_ui_revamp"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/bp_colors_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/bp_colors_flag_values.textproto
deleted file mode 100644
index f1b1de2d..00000000
--- a/aconfig/trunk_staging/com.android.systemui/bp_colors_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "bp_colors"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/bp_icon_a11y_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/bp_icon_a11y_flag_values.textproto
deleted file mode 100644
index 7741e2cf..00000000
--- a/aconfig/trunk_staging/com.android.systemui/bp_icon_a11y_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "bp_icon_a11y"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/bp_talkback_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/bp_talkback_flag_values.textproto
deleted file mode 100644
index fa544966..00000000
--- a/aconfig/trunk_staging/com.android.systemui/bp_talkback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "bp_talkback"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/centralized_status_bar_height_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/centralized_status_bar_height_fix_flag_values.textproto
deleted file mode 100644
index b743da83..00000000
--- a/aconfig/trunk_staging/com.android.systemui/centralized_status_bar_height_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "centralized_status_bar_height_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/check_lockscreen_gone_transition_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/check_lockscreen_gone_transition_flag_values.textproto
deleted file mode 100644
index f26923a5..00000000
--- a/aconfig/trunk_staging/com.android.systemui/check_lockscreen_gone_transition_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "check_lockscreen_gone_transition"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/classic_flags_multi_user_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/classic_flags_multi_user_flag_values.textproto
deleted file mode 100644
index d606d7f7..00000000
--- a/aconfig/trunk_staging/com.android.systemui/classic_flags_multi_user_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "classic_flags_multi_user"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/clipboard_image_timeout_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/clipboard_image_timeout_flag_values.textproto
deleted file mode 100644
index 9deb38f7..00000000
--- a/aconfig/trunk_staging/com.android.systemui/clipboard_image_timeout_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "clipboard_image_timeout"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/clipboard_noninteractive_on_lockscreen_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/clipboard_noninteractive_on_lockscreen_flag_values.textproto
deleted file mode 100644
index cb3ce630..00000000
--- a/aconfig/trunk_staging/com.android.systemui/clipboard_noninteractive_on_lockscreen_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "clipboard_noninteractive_on_lockscreen"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/clipboard_shared_transitions_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/clipboard_shared_transitions_flag_values.textproto
deleted file mode 100644
index ff9dc262..00000000
--- a/aconfig/trunk_staging/com.android.systemui/clipboard_shared_transitions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "clipboard_shared_transitions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/clipboard_use_description_mimetype_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/clipboard_use_description_mimetype_flag_values.textproto
deleted file mode 100644
index bd4301eb..00000000
--- a/aconfig/trunk_staging/com.android.systemui/clipboard_use_description_mimetype_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "clipboard_use_description_mimetype"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/clock_fidget_animation_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/clock_fidget_animation_flag_values.textproto
deleted file mode 100644
index 3fc41508..00000000
--- a/aconfig/trunk_staging/com.android.systemui/clock_fidget_animation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "clock_fidget_animation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/communal_bouncer_do_not_modify_plugin_open_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/communal_bouncer_do_not_modify_plugin_open_flag_values.textproto
deleted file mode 100644
index 2f752189..00000000
--- a/aconfig/trunk_staging/com.android.systemui/communal_bouncer_do_not_modify_plugin_open_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "communal_bouncer_do_not_modify_plugin_open"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/communal_edit_widgets_activity_finish_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/communal_edit_widgets_activity_finish_fix_flag_values.textproto
deleted file mode 100644
index 66abd0d0..00000000
--- a/aconfig/trunk_staging/com.android.systemui/communal_edit_widgets_activity_finish_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "communal_edit_widgets_activity_finish_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/communal_hub_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/communal_hub_flag_values.textproto
deleted file mode 100644
index c29d78a6..00000000
--- a/aconfig/trunk_staging/com.android.systemui/communal_hub_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "communal_hub"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/communal_hub_use_thread_pool_for_widgets_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/communal_hub_use_thread_pool_for_widgets_flag_values.textproto
deleted file mode 100644
index 804aa8c4..00000000
--- a/aconfig/trunk_staging/com.android.systemui/communal_hub_use_thread_pool_for_widgets_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "communal_hub_use_thread_pool_for_widgets"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/communal_responsive_grid_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/communal_responsive_grid_flag_values.textproto
deleted file mode 100644
index 1e704ef2..00000000
--- a/aconfig/trunk_staging/com.android.systemui/communal_responsive_grid_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "communal_responsive_grid"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/communal_scene_ktf_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/communal_scene_ktf_refactor_flag_values.textproto
deleted file mode 100644
index 9d6dc78c..00000000
--- a/aconfig/trunk_staging/com.android.systemui/communal_scene_ktf_refactor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "communal_scene_ktf_refactor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/communal_timer_flicker_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/communal_timer_flicker_fix_flag_values.textproto
deleted file mode 100644
index 157e6cf4..00000000
--- a/aconfig/trunk_staging/com.android.systemui/communal_timer_flicker_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "communal_timer_flicker_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/communal_widget_resizing_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/communal_widget_resizing_flag_values.textproto
deleted file mode 100644
index a653fa63..00000000
--- a/aconfig/trunk_staging/com.android.systemui/communal_widget_resizing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "communal_widget_resizing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/communal_widget_trampoline_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/communal_widget_trampoline_fix_flag_values.textproto
deleted file mode 100644
index 883c2d7e..00000000
--- a/aconfig/trunk_staging/com.android.systemui/communal_widget_trampoline_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "communal_widget_trampoline_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/confine_notification_touch_to_view_width_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/confine_notification_touch_to_view_width_flag_values.textproto
deleted file mode 100644
index a2ab30e9..00000000
--- a/aconfig/trunk_staging/com.android.systemui/confine_notification_touch_to_view_width_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "confine_notification_touch_to_view_width"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/constraint_bp_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/constraint_bp_flag_values.textproto
deleted file mode 100644
index f7a579d8..00000000
--- a/aconfig/trunk_staging/com.android.systemui/constraint_bp_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "constraint_bp"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/cont_auth_plugin_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/cont_auth_plugin_flag_values.textproto
deleted file mode 100644
index be70e554..00000000
--- a/aconfig/trunk_staging/com.android.systemui/cont_auth_plugin_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "cont_auth_plugin"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/contextual_tips_assistant_dismiss_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/contextual_tips_assistant_dismiss_fix_flag_values.textproto
deleted file mode 100644
index d23693ba..00000000
--- a/aconfig/trunk_staging/com.android.systemui/contextual_tips_assistant_dismiss_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "contextual_tips_assistant_dismiss_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/coroutine_tracing_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/coroutine_tracing_flag_values.textproto
deleted file mode 100644
index 8db478b4..00000000
--- a/aconfig/trunk_staging/com.android.systemui/coroutine_tracing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "coroutine_tracing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/create_windowless_window_magnifier_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/create_windowless_window_magnifier_flag_values.textproto
deleted file mode 100644
index e89cdb69..00000000
--- a/aconfig/trunk_staging/com.android.systemui/create_windowless_window_magnifier_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "create_windowless_window_magnifier"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/dedicated_notif_inflation_thread_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/dedicated_notif_inflation_thread_flag_values.textproto
deleted file mode 100644
index 09e791da..00000000
--- a/aconfig/trunk_staging/com.android.systemui/dedicated_notif_inflation_thread_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "dedicated_notif_inflation_thread"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/delay_show_magnification_button_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/delay_show_magnification_button_flag_values.textproto
deleted file mode 100644
index 19dea1c8..00000000
--- a/aconfig/trunk_staging/com.android.systemui/delay_show_magnification_button_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "delay_show_magnification_button"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/delayed_wakelock_release_on_background_thread_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/delayed_wakelock_release_on_background_thread_flag_values.textproto
deleted file mode 100644
index c5f5d348..00000000
--- a/aconfig/trunk_staging/com.android.systemui/delayed_wakelock_release_on_background_thread_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "delayed_wakelock_release_on_background_thread"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/device_entry_udfps_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/device_entry_udfps_refactor_flag_values.textproto
deleted file mode 100644
index a9bf1fd7..00000000
--- a/aconfig/trunk_staging/com.android.systemui/device_entry_udfps_refactor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "device_entry_udfps_refactor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/disable_blurred_shade_visible_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/disable_blurred_shade_visible_flag_values.textproto
deleted file mode 100644
index b8a760a5..00000000
--- a/aconfig/trunk_staging/com.android.systemui/disable_blurred_shade_visible_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "disable_blurred_shade_visible"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/disable_contextual_tips_ios_switcher_check_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/disable_contextual_tips_ios_switcher_check_flag_values.textproto
deleted file mode 100644
index b8123d0a..00000000
--- a/aconfig/trunk_staging/com.android.systemui/disable_contextual_tips_ios_switcher_check_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "disable_contextual_tips_ios_switcher_check"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/disable_shade_trackpad_two_finger_swipe_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/disable_shade_trackpad_two_finger_swipe_flag_values.textproto
deleted file mode 100644
index b2ea7071..00000000
--- a/aconfig/trunk_staging/com.android.systemui/disable_shade_trackpad_two_finger_swipe_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "disable_shade_trackpad_two_finger_swipe"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/dream_input_session_pilfer_once_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/dream_input_session_pilfer_once_flag_values.textproto
deleted file mode 100644
index 18a50fdf..00000000
--- a/aconfig/trunk_staging/com.android.systemui/dream_input_session_pilfer_once_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "dream_input_session_pilfer_once"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/dream_overlay_bouncer_swipe_direction_filtering_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/dream_overlay_bouncer_swipe_direction_filtering_flag_values.textproto
deleted file mode 100644
index eed852eb..00000000
--- a/aconfig/trunk_staging/com.android.systemui/dream_overlay_bouncer_swipe_direction_filtering_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "dream_overlay_bouncer_swipe_direction_filtering"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/edgeback_gesture_handler_get_running_tasks_background_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/edgeback_gesture_handler_get_running_tasks_background_flag_values.textproto
deleted file mode 100644
index fae18fe9..00000000
--- a/aconfig/trunk_staging/com.android.systemui/edgeback_gesture_handler_get_running_tasks_background_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "edgeback_gesture_handler_get_running_tasks_background"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/enable_background_keyguard_ondrawn_callback_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/enable_background_keyguard_ondrawn_callback_flag_values.textproto
deleted file mode 100644
index e1576763..00000000
--- a/aconfig/trunk_staging/com.android.systemui/enable_background_keyguard_ondrawn_callback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "enable_background_keyguard_ondrawn_callback"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/enable_contextual_tip_for_power_off_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/enable_contextual_tip_for_power_off_flag_values.textproto
deleted file mode 100644
index 81d3bf58..00000000
--- a/aconfig/trunk_staging/com.android.systemui/enable_contextual_tip_for_power_off_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "enable_contextual_tip_for_power_off"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/enable_contextual_tip_for_take_screenshot_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/enable_contextual_tip_for_take_screenshot_flag_values.textproto
deleted file mode 100644
index c011e1db..00000000
--- a/aconfig/trunk_staging/com.android.systemui/enable_contextual_tip_for_take_screenshot_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "enable_contextual_tip_for_take_screenshot"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/enable_contextual_tips_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/enable_contextual_tips_flag_values.textproto
deleted file mode 100644
index 5a4a8a01..00000000
--- a/aconfig/trunk_staging/com.android.systemui/enable_contextual_tips_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "enable_contextual_tips"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/enable_view_capture_tracing_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/enable_view_capture_tracing_flag_values.textproto
deleted file mode 100644
index c1e486fc..00000000
--- a/aconfig/trunk_staging/com.android.systemui/enable_view_capture_tracing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "enable_view_capture_tracing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/enforce_brightness_base_user_restriction_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/enforce_brightness_base_user_restriction_flag_values.textproto
deleted file mode 100644
index 2d2a0b0f..00000000
--- a/aconfig/trunk_staging/com.android.systemui/enforce_brightness_base_user_restriction_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "enforce_brightness_base_user_restriction"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/expand_collapse_privacy_dialog_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/expand_collapse_privacy_dialog_flag_values.textproto
deleted file mode 100644
index d843aa42..00000000
--- a/aconfig/trunk_staging/com.android.systemui/expand_collapse_privacy_dialog_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "expand_collapse_privacy_dialog"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/expand_heads_up_on_inline_reply_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/expand_heads_up_on_inline_reply_flag_values.textproto
deleted file mode 100644
index 67f7ee06..00000000
--- a/aconfig/trunk_staging/com.android.systemui/expand_heads_up_on_inline_reply_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "expand_heads_up_on_inline_reply"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/extended_apps_shortcut_category_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/extended_apps_shortcut_category_flag_values.textproto
deleted file mode 100644
index 9036da19..00000000
--- a/aconfig/trunk_staging/com.android.systemui/extended_apps_shortcut_category_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "extended_apps_shortcut_category"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/face_message_defer_update_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/face_message_defer_update_flag_values.textproto
deleted file mode 100644
index 7a6b60ea..00000000
--- a/aconfig/trunk_staging/com.android.systemui/face_message_defer_update_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "face_message_defer_update"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/face_scanning_animation_npe_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/face_scanning_animation_npe_fix_flag_values.textproto
deleted file mode 100644
index 032191ef..00000000
--- a/aconfig/trunk_staging/com.android.systemui/face_scanning_animation_npe_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "face_scanning_animation_npe_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/faster_unlock_transition_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/faster_unlock_transition_flag_values.textproto
deleted file mode 100644
index 24cb66ce..00000000
--- a/aconfig/trunk_staging/com.android.systemui/faster_unlock_transition_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "faster_unlock_transition"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/fetch_bookmarks_xml_keyboard_shortcuts_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/fetch_bookmarks_xml_keyboard_shortcuts_flag_values.textproto
deleted file mode 100644
index c4e29453..00000000
--- a/aconfig/trunk_staging/com.android.systemui/fetch_bookmarks_xml_keyboard_shortcuts_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "fetch_bookmarks_xml_keyboard_shortcuts"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/fix_image_wallpaper_crash_surface_already_released_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/fix_image_wallpaper_crash_surface_already_released_flag_values.textproto
deleted file mode 100644
index 336143a0..00000000
--- a/aconfig/trunk_staging/com.android.systemui/fix_image_wallpaper_crash_surface_already_released_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "fix_image_wallpaper_crash_surface_already_released"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/fix_screenshot_action_dismiss_system_windows_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/fix_screenshot_action_dismiss_system_windows_flag_values.textproto
deleted file mode 100644
index 215846fa..00000000
--- a/aconfig/trunk_staging/com.android.systemui/fix_screenshot_action_dismiss_system_windows_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "fix_screenshot_action_dismiss_system_windows"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/floating_menu_animated_tuck_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/floating_menu_animated_tuck_flag_values.textproto
deleted file mode 100644
index 4abce1f5..00000000
--- a/aconfig/trunk_staging/com.android.systemui/floating_menu_animated_tuck_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "floating_menu_animated_tuck"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/floating_menu_display_cutout_support_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/floating_menu_display_cutout_support_flag_values.textproto
deleted file mode 100644
index 7c7a06fd..00000000
--- a/aconfig/trunk_staging/com.android.systemui/floating_menu_display_cutout_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "floating_menu_display_cutout_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/floating_menu_drag_to_edit_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/floating_menu_drag_to_edit_flag_values.textproto
deleted file mode 100644
index 119f18c8..00000000
--- a/aconfig/trunk_staging/com.android.systemui/floating_menu_drag_to_edit_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "floating_menu_drag_to_edit"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/floating_menu_ime_displacement_animation_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/floating_menu_ime_displacement_animation_flag_values.textproto
deleted file mode 100644
index 8108ee17..00000000
--- a/aconfig/trunk_staging/com.android.systemui/floating_menu_ime_displacement_animation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "floating_menu_ime_displacement_animation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/floating_menu_narrow_target_content_observer_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/floating_menu_narrow_target_content_observer_flag_values.textproto
deleted file mode 100644
index 7899b757..00000000
--- a/aconfig/trunk_staging/com.android.systemui/floating_menu_narrow_target_content_observer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "floating_menu_narrow_target_content_observer"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/floating_menu_notify_targets_changed_on_strict_diff_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/floating_menu_notify_targets_changed_on_strict_diff_flag_values.textproto
deleted file mode 100644
index d45698d5..00000000
--- a/aconfig/trunk_staging/com.android.systemui/floating_menu_notify_targets_changed_on_strict_diff_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "floating_menu_notify_targets_changed_on_strict_diff"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/floating_menu_overlaps_nav_bars_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/floating_menu_overlaps_nav_bars_flag_flag_values.textproto
deleted file mode 100644
index 05ee12c4..00000000
--- a/aconfig/trunk_staging/com.android.systemui/floating_menu_overlaps_nav_bars_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "floating_menu_overlaps_nav_bars_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/floating_menu_radii_animation_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/floating_menu_radii_animation_flag_values.textproto
deleted file mode 100644
index 00faebbb..00000000
--- a/aconfig/trunk_staging/com.android.systemui/floating_menu_radii_animation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "floating_menu_radii_animation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/get_connected_device_name_unsynchronized_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/get_connected_device_name_unsynchronized_flag_values.textproto
deleted file mode 100644
index 5b62bb4b..00000000
--- a/aconfig/trunk_staging/com.android.systemui/get_connected_device_name_unsynchronized_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "get_connected_device_name_unsynchronized"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/glanceable_hub_direct_edit_mode_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/glanceable_hub_direct_edit_mode_flag_values.textproto
deleted file mode 100644
index 30e2e8e0..00000000
--- a/aconfig/trunk_staging/com.android.systemui/glanceable_hub_direct_edit_mode_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "glanceable_hub_direct_edit_mode"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/glanceable_hub_v2_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/glanceable_hub_v2_flag_values.textproto
deleted file mode 100644
index 2d52c933..00000000
--- a/aconfig/trunk_staging/com.android.systemui/glanceable_hub_v2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "glanceable_hub_v2"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/glanceable_hub_v2_resources_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/glanceable_hub_v2_resources_flag_values.textproto
deleted file mode 100644
index 61231abd..00000000
--- a/aconfig/trunk_staging/com.android.systemui/glanceable_hub_v2_resources_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "glanceable_hub_v2_resources"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/haptic_brightness_slider_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/haptic_brightness_slider_flag_values.textproto
deleted file mode 100644
index d9c76f87..00000000
--- a/aconfig/trunk_staging/com.android.systemui/haptic_brightness_slider_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "haptic_brightness_slider"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/haptic_volume_slider_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/haptic_volume_slider_flag_values.textproto
deleted file mode 100644
index 753b3736..00000000
--- a/aconfig/trunk_staging/com.android.systemui/haptic_volume_slider_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "haptic_volume_slider"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/haptics_for_compose_sliders_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/haptics_for_compose_sliders_flag_values.textproto
deleted file mode 100644
index 4d448501..00000000
--- a/aconfig/trunk_staging/com.android.systemui/haptics_for_compose_sliders_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "haptics_for_compose_sliders"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/hardware_color_styles_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/hardware_color_styles_flag_values.textproto
deleted file mode 100644
index 8ea3483e..00000000
--- a/aconfig/trunk_staging/com.android.systemui/hardware_color_styles_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "hardware_color_styles"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/hearing_aids_qs_tile_dialog_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/hearing_aids_qs_tile_dialog_flag_values.textproto
deleted file mode 100644
index 6dda8be2..00000000
--- a/aconfig/trunk_staging/com.android.systemui/hearing_aids_qs_tile_dialog_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "hearing_aids_qs_tile_dialog"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/hearing_devices_dialog_related_tools_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/hearing_devices_dialog_related_tools_flag_values.textproto
deleted file mode 100644
index 6a622ffc..00000000
--- a/aconfig/trunk_staging/com.android.systemui/hearing_devices_dialog_related_tools_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "hearing_devices_dialog_related_tools"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/hearing_devices_input_routing_ui_improvement_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/hearing_devices_input_routing_ui_improvement_flag_values.textproto
deleted file mode 100644
index a28a693e..00000000
--- a/aconfig/trunk_staging/com.android.systemui/hearing_devices_input_routing_ui_improvement_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "hearing_devices_input_routing_ui_improvement"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/hide_ringer_button_in_single_volume_mode_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/hide_ringer_button_in_single_volume_mode_flag_values.textproto
deleted file mode 100644
index a4c8933f..00000000
--- a/aconfig/trunk_staging/com.android.systemui/hide_ringer_button_in_single_volume_mode_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "hide_ringer_button_in_single_volume_mode"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/home_controls_dream_hsum_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/home_controls_dream_hsum_flag_values.textproto
deleted file mode 100644
index c12095dd..00000000
--- a/aconfig/trunk_staging/com.android.systemui/home_controls_dream_hsum_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "home_controls_dream_hsum"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/hub_edit_mode_touch_adjustments_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/hub_edit_mode_touch_adjustments_flag_values.textproto
deleted file mode 100644
index 44c19f2b..00000000
--- a/aconfig/trunk_staging/com.android.systemui/hub_edit_mode_touch_adjustments_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "hub_edit_mode_touch_adjustments"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/ignore_touches_next_to_notification_shelf_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/ignore_touches_next_to_notification_shelf_flag_values.textproto
deleted file mode 100644
index be5a63f9..00000000
--- a/aconfig/trunk_staging/com.android.systemui/ignore_touches_next_to_notification_shelf_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "ignore_touches_next_to_notification_shelf"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/indication_text_a11y_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/indication_text_a11y_fix_flag_values.textproto
deleted file mode 100644
index 7f66087e..00000000
--- a/aconfig/trunk_staging/com.android.systemui/indication_text_a11y_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "indication_text_a11y_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/keyboard_shortcut_helper_rewrite_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/keyboard_shortcut_helper_rewrite_flag_values.textproto
deleted file mode 100644
index 563854b9..00000000
--- a/aconfig/trunk_staging/com.android.systemui/keyboard_shortcut_helper_rewrite_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "keyboard_shortcut_helper_rewrite"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/keyboard_shortcut_helper_shortcut_customizer_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/keyboard_shortcut_helper_shortcut_customizer_flag_values.textproto
deleted file mode 100644
index f8f46fa7..00000000
--- a/aconfig/trunk_staging/com.android.systemui/keyboard_shortcut_helper_shortcut_customizer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "keyboard_shortcut_helper_shortcut_customizer"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/keyboard_touchpad_contextual_education_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/keyboard_touchpad_contextual_education_flag_values.textproto
deleted file mode 100644
index c205b13c..00000000
--- a/aconfig/trunk_staging/com.android.systemui/keyboard_touchpad_contextual_education_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "keyboard_touchpad_contextual_education"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/keyguard_bottom_area_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/keyguard_bottom_area_refactor_flag_values.textproto
deleted file mode 100644
index ee1883cf..00000000
--- a/aconfig/trunk_staging/com.android.systemui/keyguard_bottom_area_refactor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "keyguard_bottom_area_refactor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/keyguard_transition_force_finish_on_screen_off_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/keyguard_transition_force_finish_on_screen_off_flag_values.textproto
deleted file mode 100644
index 4ea52b66..00000000
--- a/aconfig/trunk_staging/com.android.systemui/keyguard_transition_force_finish_on_screen_off_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "keyguard_transition_force_finish_on_screen_off"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/keyguard_wm_reorder_atms_calls_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/keyguard_wm_reorder_atms_calls_flag_values.textproto
deleted file mode 100644
index 54b9d5b4..00000000
--- a/aconfig/trunk_staging/com.android.systemui/keyguard_wm_reorder_atms_calls_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "keyguard_wm_reorder_atms_calls"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/lockscreen_font_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/lockscreen_font_flag_values.textproto
deleted file mode 100644
index 16dd8160..00000000
--- a/aconfig/trunk_staging/com.android.systemui/lockscreen_font_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "lockscreen_font"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/lockscreen_preview_renderer_create_on_main_thread_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/lockscreen_preview_renderer_create_on_main_thread_flag_values.textproto
deleted file mode 100644
index d18f81c5..00000000
--- a/aconfig/trunk_staging/com.android.systemui/lockscreen_preview_renderer_create_on_main_thread_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "lockscreen_preview_renderer_create_on_main_thread"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/low_light_clock_dream_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/low_light_clock_dream_flag_values.textproto
deleted file mode 100644
index 61416942..00000000
--- a/aconfig/trunk_staging/com.android.systemui/low_light_clock_dream_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "low_light_clock_dream"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/magnetic_notification_swipes_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/magnetic_notification_swipes_flag_values.textproto
deleted file mode 100644
index 7fcf56ed..00000000
--- a/aconfig/trunk_staging/com.android.systemui/magnetic_notification_swipes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "magnetic_notification_swipes"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/media_controls_a11y_colors_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/media_controls_a11y_colors_flag_values.textproto
deleted file mode 100644
index 896efa9f..00000000
--- a/aconfig/trunk_staging/com.android.systemui/media_controls_a11y_colors_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "media_controls_a11y_colors"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/media_controls_device_manager_background_execution_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/media_controls_device_manager_background_execution_flag_values.textproto
deleted file mode 100644
index 84dd76d6..00000000
--- a/aconfig/trunk_staging/com.android.systemui/media_controls_device_manager_background_execution_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "media_controls_device_manager_background_execution"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/media_controls_drawables_reuse_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/media_controls_drawables_reuse_bugfix_flag_values.textproto
deleted file mode 100644
index e4b1e5cc..00000000
--- a/aconfig/trunk_staging/com.android.systemui/media_controls_drawables_reuse_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "media_controls_drawables_reuse_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/media_controls_drawables_reuse_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/media_controls_drawables_reuse_flag_values.textproto
deleted file mode 100644
index d86d3b75..00000000
--- a/aconfig/trunk_staging/com.android.systemui/media_controls_drawables_reuse_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "media_controls_drawables_reuse"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/media_controls_lockscreen_shade_bug_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/media_controls_lockscreen_shade_bug_fix_flag_values.textproto
deleted file mode 100644
index 5a3b4feb..00000000
--- a/aconfig/trunk_staging/com.android.systemui/media_controls_lockscreen_shade_bug_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "media_controls_lockscreen_shade_bug_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/media_controls_posts_optimization_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/media_controls_posts_optimization_flag_values.textproto
deleted file mode 100644
index 343e52c6..00000000
--- a/aconfig/trunk_staging/com.android.systemui/media_controls_posts_optimization_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "media_controls_posts_optimization"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/media_controls_ui_update_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/media_controls_ui_update_flag_values.textproto
deleted file mode 100644
index 7372dfc2..00000000
--- a/aconfig/trunk_staging/com.android.systemui/media_controls_ui_update_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "media_controls_ui_update"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/media_controls_umo_inflation_in_background_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/media_controls_umo_inflation_in_background_flag_values.textproto
deleted file mode 100644
index 5f115720..00000000
--- a/aconfig/trunk_staging/com.android.systemui/media_controls_umo_inflation_in_background_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "media_controls_umo_inflation_in_background"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/media_controls_user_initiated_deleteintent_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/media_controls_user_initiated_deleteintent_flag_values.textproto
deleted file mode 100644
index b3885e0e..00000000
--- a/aconfig/trunk_staging/com.android.systemui/media_controls_user_initiated_deleteintent_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "media_controls_user_initiated_deleteintent"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/media_load_metadata_via_media_data_loader_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/media_load_metadata_via_media_data_loader_flag_values.textproto
deleted file mode 100644
index e5035d17..00000000
--- a/aconfig/trunk_staging/com.android.systemui/media_load_metadata_via_media_data_loader_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "media_load_metadata_via_media_data_loader"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/media_lockscreen_launch_animation_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/media_lockscreen_launch_animation_flag_values.textproto
deleted file mode 100644
index de02f0d2..00000000
--- a/aconfig/trunk_staging/com.android.systemui/media_lockscreen_launch_animation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "media_lockscreen_launch_animation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/media_projection_dialog_behind_lockscreen_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/media_projection_dialog_behind_lockscreen_flag_values.textproto
deleted file mode 100644
index 6baa760e..00000000
--- a/aconfig/trunk_staging/com.android.systemui/media_projection_dialog_behind_lockscreen_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "media_projection_dialog_behind_lockscreen"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/media_projection_grey_error_text_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/media_projection_grey_error_text_flag_values.textproto
deleted file mode 100644
index 564d448d..00000000
--- a/aconfig/trunk_staging/com.android.systemui/media_projection_grey_error_text_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "media_projection_grey_error_text"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/media_projection_request_attribution_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/media_projection_request_attribution_fix_flag_values.textproto
deleted file mode 100644
index c3874ec0..00000000
--- a/aconfig/trunk_staging/com.android.systemui/media_projection_request_attribution_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "media_projection_request_attribution_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/migrate_clocks_to_blueprint_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/migrate_clocks_to_blueprint_flag_values.textproto
deleted file mode 100644
index 7da19252..00000000
--- a/aconfig/trunk_staging/com.android.systemui/migrate_clocks_to_blueprint_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "migrate_clocks_to_blueprint"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/move_transition_animation_layer_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/move_transition_animation_layer_flag_values.textproto
deleted file mode 100644
index edc0450e..00000000
--- a/aconfig/trunk_staging/com.android.systemui/move_transition_animation_layer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "move_transition_animation_layer"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/msdl_feedback_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/msdl_feedback_flag_values.textproto
deleted file mode 100644
index 0292f23d..00000000
--- a/aconfig/trunk_staging/com.android.systemui/msdl_feedback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "msdl_feedback"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/multiuser_wifi_picker_tracker_support_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/multiuser_wifi_picker_tracker_support_flag_values.textproto
deleted file mode 100644
index 94912dc0..00000000
--- a/aconfig/trunk_staging/com.android.systemui/multiuser_wifi_picker_tracker_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "multiuser_wifi_picker_tracker_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/new_aod_transition_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/new_aod_transition_flag_values.textproto
deleted file mode 100644
index f2d8a5d9..00000000
--- a/aconfig/trunk_staging/com.android.systemui/new_aod_transition_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "new_aod_transition"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/new_volume_panel_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/new_volume_panel_flag_values.textproto
deleted file mode 100644
index d95d13b5..00000000
--- a/aconfig/trunk_staging/com.android.systemui/new_volume_panel_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "new_volume_panel"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/non_touchscreen_devices_bypass_falsing_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/non_touchscreen_devices_bypass_falsing_flag_values.textproto
deleted file mode 100644
index fa298d3c..00000000
--- a/aconfig/trunk_staging/com.android.systemui/non_touchscreen_devices_bypass_falsing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "non_touchscreen_devices_bypass_falsing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notification_appear_nonlinear_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notification_appear_nonlinear_flag_values.textproto
deleted file mode 100644
index 567b20f3..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notification_appear_nonlinear_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notification_appear_nonlinear"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notification_async_group_header_inflation_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notification_async_group_header_inflation_flag_values.textproto
deleted file mode 100644
index fe52874f..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notification_async_group_header_inflation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notification_async_group_header_inflation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notification_async_hybrid_view_inflation_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notification_async_hybrid_view_inflation_flag_values.textproto
deleted file mode 100644
index ffe8493a..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notification_async_hybrid_view_inflation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notification_async_hybrid_view_inflation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notification_avalanche_suppression_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notification_avalanche_suppression_flag_values.textproto
deleted file mode 100644
index a21e1ed4..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notification_avalanche_suppression_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notification_avalanche_suppression"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notification_avalanche_throttle_hun_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notification_avalanche_throttle_hun_flag_values.textproto
deleted file mode 100644
index 36c91f66..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notification_avalanche_throttle_hun_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notification_avalanche_throttle_hun"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notification_bundle_ui_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notification_bundle_ui_flag_values.textproto
deleted file mode 100644
index 437a78f1..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notification_bundle_ui_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notification_bundle_ui"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notification_content_alpha_optimization_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notification_content_alpha_optimization_flag_values.textproto
deleted file mode 100644
index dbe30324..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notification_content_alpha_optimization_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notification_content_alpha_optimization"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notification_media_manager_background_execution_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notification_media_manager_background_execution_flag_values.textproto
deleted file mode 100644
index 2e752506..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notification_media_manager_background_execution_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notification_media_manager_background_execution"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notification_over_expansion_clipping_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notification_over_expansion_clipping_fix_flag_values.textproto
deleted file mode 100644
index cd4812df..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notification_over_expansion_clipping_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notification_over_expansion_clipping_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notification_pulsing_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notification_pulsing_fix_flag_values.textproto
deleted file mode 100644
index 6fcdc7a2..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notification_pulsing_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notification_pulsing_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notification_reentrant_dismiss_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notification_reentrant_dismiss_flag_values.textproto
deleted file mode 100644
index 8c4915e5..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notification_reentrant_dismiss_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notification_reentrant_dismiss"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notification_row_accessibility_expanded_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notification_row_accessibility_expanded_flag_values.textproto
deleted file mode 100644
index 8bfff92f..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notification_row_accessibility_expanded_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notification_row_accessibility_expanded"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notification_row_content_binder_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notification_row_content_binder_refactor_flag_values.textproto
deleted file mode 100644
index 20193bc5..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notification_row_content_binder_refactor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notification_row_content_binder_refactor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notification_row_user_context_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notification_row_user_context_flag_values.textproto
deleted file mode 100644
index 7940372d..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notification_row_user_context_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notification_row_user_context"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notification_shade_blur_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notification_shade_blur_flag_values.textproto
deleted file mode 100644
index 36d82861..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notification_shade_blur_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notification_shade_blur"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notification_skip_silent_updates_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notification_skip_silent_updates_flag_values.textproto
deleted file mode 100644
index 7f878cf8..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notification_skip_silent_updates_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notification_skip_silent_updates"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notification_transparent_header_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notification_transparent_header_fix_flag_values.textproto
deleted file mode 100644
index 6b54c080..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notification_transparent_header_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notification_transparent_header_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notification_undo_guts_on_config_changed_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notification_undo_guts_on_config_changed_flag_values.textproto
deleted file mode 100644
index 0db519c4..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notification_undo_guts_on_config_changed_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notification_undo_guts_on_config_changed"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notification_view_flipper_pausing_v2_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notification_view_flipper_pausing_v2_flag_values.textproto
deleted file mode 100644
index 2709e7fc..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notification_view_flipper_pausing_v2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notification_view_flipper_pausing_v2"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notifications_background_icons_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notifications_background_icons_flag_values.textproto
deleted file mode 100644
index ca481736..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notifications_background_icons_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notifications_background_icons"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notifications_footer_view_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notifications_footer_view_refactor_flag_values.textproto
deleted file mode 100644
index b914e48b..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notifications_footer_view_refactor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notifications_footer_view_refactor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notifications_footer_visibility_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notifications_footer_visibility_fix_flag_values.textproto
deleted file mode 100644
index cc356ab5..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notifications_footer_visibility_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notifications_footer_visibility_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notifications_hun_shared_animation_values_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notifications_hun_shared_animation_values_flag_values.textproto
deleted file mode 100644
index efd2cc76..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notifications_hun_shared_animation_values_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notifications_hun_shared_animation_values"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notifications_icon_container_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notifications_icon_container_refactor_flag_values.textproto
deleted file mode 100644
index 109b9023..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notifications_icon_container_refactor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notifications_icon_container_refactor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notifications_improved_hun_animation_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notifications_improved_hun_animation_flag_values.textproto
deleted file mode 100644
index b7f5bef3..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notifications_improved_hun_animation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notifications_improved_hun_animation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notifications_launch_radius_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notifications_launch_radius_flag_values.textproto
deleted file mode 100644
index e47602d1..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notifications_launch_radius_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notifications_launch_radius"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notifications_live_data_store_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notifications_live_data_store_refactor_flag_values.textproto
deleted file mode 100644
index 90d9f673..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notifications_live_data_store_refactor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notifications_live_data_store_refactor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notifications_pinned_hun_in_shade_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notifications_pinned_hun_in_shade_flag_values.textproto
deleted file mode 100644
index 5c6e1040..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notifications_pinned_hun_in_shade_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notifications_pinned_hun_in_shade"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notifications_redesign_footer_view_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notifications_redesign_footer_view_flag_values.textproto
deleted file mode 100644
index ee396388..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notifications_redesign_footer_view_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notifications_redesign_footer_view"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notifications_redesign_guts_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notifications_redesign_guts_flag_values.textproto
deleted file mode 100644
index f98bf1d9..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notifications_redesign_guts_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notifications_redesign_guts"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notify_password_text_view_user_activity_in_background_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notify_password_text_view_user_activity_in_background_flag_values.textproto
deleted file mode 100644
index 0d3179e9..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notify_password_text_view_user_activity_in_background_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notify_password_text_view_user_activity_in_background"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notify_power_manager_user_activity_background_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notify_power_manager_user_activity_background_flag_values.textproto
deleted file mode 100644
index 960449b6..00000000
--- a/aconfig/trunk_staging/com.android.systemui/notify_power_manager_user_activity_background_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notify_power_manager_user_activity_background"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/only_show_media_stream_slider_in_single_volume_mode_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/only_show_media_stream_slider_in_single_volume_mode_flag_values.textproto
deleted file mode 100644
index e26f0a55..00000000
--- a/aconfig/trunk_staging/com.android.systemui/only_show_media_stream_slider_in_single_volume_mode_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "only_show_media_stream_slider_in_single_volume_mode"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/permission_helper_ui_rich_ongoing_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/permission_helper_ui_rich_ongoing_flag_values.textproto
deleted file mode 100644
index 477968d2..00000000
--- a/aconfig/trunk_staging/com.android.systemui/permission_helper_ui_rich_ongoing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "permission_helper_ui_rich_ongoing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/physical_notification_movement_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/physical_notification_movement_flag_values.textproto
deleted file mode 100644
index 3c4d4c2b..00000000
--- a/aconfig/trunk_staging/com.android.systemui/physical_notification_movement_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "physical_notification_movement"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/pin_input_field_styled_focus_state_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/pin_input_field_styled_focus_state_flag_values.textproto
deleted file mode 100644
index c3aa4d30..00000000
--- a/aconfig/trunk_staging/com.android.systemui/pin_input_field_styled_focus_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "pin_input_field_styled_focus_state"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/predictive_back_animate_bouncer_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/predictive_back_animate_bouncer_flag_values.textproto
deleted file mode 100644
index 0c5b6a68..00000000
--- a/aconfig/trunk_staging/com.android.systemui/predictive_back_animate_bouncer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "predictive_back_animate_bouncer"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/predictive_back_animate_dialogs_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/predictive_back_animate_dialogs_flag_values.textproto
deleted file mode 100644
index 381c1a14..00000000
--- a/aconfig/trunk_staging/com.android.systemui/predictive_back_animate_dialogs_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "predictive_back_animate_dialogs"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/predictive_back_delay_wm_transition_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/predictive_back_delay_wm_transition_flag_values.textproto
deleted file mode 100644
index 71b6e586..00000000
--- a/aconfig/trunk_staging/com.android.systemui/predictive_back_delay_wm_transition_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "predictive_back_delay_wm_transition"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/predictive_back_sysui_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/predictive_back_sysui_flag_values.textproto
deleted file mode 100644
index cb926d55..00000000
--- a/aconfig/trunk_staging/com.android.systemui/predictive_back_sysui_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "predictive_back_sysui"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/priority_people_section_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/priority_people_section_flag_values.textproto
deleted file mode 100644
index 46616b07..00000000
--- a/aconfig/trunk_staging/com.android.systemui/priority_people_section_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "priority_people_section"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/privacy_dot_unfold_wrong_corner_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/privacy_dot_unfold_wrong_corner_fix_flag_values.textproto
deleted file mode 100644
index d38aafd0..00000000
--- a/aconfig/trunk_staging/com.android.systemui/privacy_dot_unfold_wrong_corner_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "privacy_dot_unfold_wrong_corner_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/promote_notifications_automatically_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/promote_notifications_automatically_flag_values.textproto
deleted file mode 100644
index 8f71d4f2..00000000
--- a/aconfig/trunk_staging/com.android.systemui/promote_notifications_automatically_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "promote_notifications_automatically"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/pss_app_selector_abrupt_exit_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/pss_app_selector_abrupt_exit_fix_flag_values.textproto
deleted file mode 100644
index b9db0e32..00000000
--- a/aconfig/trunk_staging/com.android.systemui/pss_app_selector_abrupt_exit_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "pss_app_selector_abrupt_exit_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/pss_app_selector_recents_split_screen_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/pss_app_selector_recents_split_screen_flag_values.textproto
deleted file mode 100644
index d1ad4276..00000000
--- a/aconfig/trunk_staging/com.android.systemui/pss_app_selector_recents_split_screen_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "pss_app_selector_recents_split_screen"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/qs_custom_tile_click_guaranteed_bug_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/qs_custom_tile_click_guaranteed_bug_fix_flag_values.textproto
deleted file mode 100644
index 7c9fda5f..00000000
--- a/aconfig/trunk_staging/com.android.systemui/qs_custom_tile_click_guaranteed_bug_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "qs_custom_tile_click_guaranteed_bug_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/qs_new_pipeline_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/qs_new_pipeline_flag_values.textproto
deleted file mode 100644
index 7d585d00..00000000
--- a/aconfig/trunk_staging/com.android.systemui/qs_new_pipeline_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "qs_new_pipeline"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/qs_quick_rebind_active_tiles_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/qs_quick_rebind_active_tiles_flag_values.textproto
deleted file mode 100644
index 460ebc61..00000000
--- a/aconfig/trunk_staging/com.android.systemui/qs_quick_rebind_active_tiles_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "qs_quick_rebind_active_tiles"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/qs_register_setting_observer_on_bg_thread_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/qs_register_setting_observer_on_bg_thread_flag_values.textproto
deleted file mode 100644
index 42771208..00000000
--- a/aconfig/trunk_staging/com.android.systemui/qs_register_setting_observer_on_bg_thread_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "qs_register_setting_observer_on_bg_thread"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/qs_tile_focus_state_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/qs_tile_focus_state_flag_values.textproto
deleted file mode 100644
index 61e33cc9..00000000
--- a/aconfig/trunk_staging/com.android.systemui/qs_tile_focus_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "qs_tile_focus_state"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/qs_ui_refactor_compose_fragment_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/qs_ui_refactor_compose_fragment_flag_values.textproto
deleted file mode 100644
index 22f6c87e..00000000
--- a/aconfig/trunk_staging/com.android.systemui/qs_ui_refactor_compose_fragment_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "qs_ui_refactor_compose_fragment"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/qs_ui_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/qs_ui_refactor_flag_values.textproto
deleted file mode 100644
index 3e103ef7..00000000
--- a/aconfig/trunk_staging/com.android.systemui/qs_ui_refactor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "qs_ui_refactor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/quick_settings_visual_haptics_longpress_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/quick_settings_visual_haptics_longpress_flag_values.textproto
deleted file mode 100644
index 22aa3d3d..00000000
--- a/aconfig/trunk_staging/com.android.systemui/quick_settings_visual_haptics_longpress_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "quick_settings_visual_haptics_longpress"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/record_issue_qs_tile_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/record_issue_qs_tile_flag_values.textproto
deleted file mode 100644
index 1d96343a..00000000
--- a/aconfig/trunk_staging/com.android.systemui/record_issue_qs_tile_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "record_issue_qs_tile"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/redesign_magnification_window_size_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/redesign_magnification_window_size_flag_values.textproto
deleted file mode 100644
index e04fe410..00000000
--- a/aconfig/trunk_staging/com.android.systemui/redesign_magnification_window_size_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "redesign_magnification_window_size"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/refactor_get_current_user_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/refactor_get_current_user_flag_values.textproto
deleted file mode 100644
index f41aabac..00000000
--- a/aconfig/trunk_staging/com.android.systemui/refactor_get_current_user_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "refactor_get_current_user"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/register_content_observers_async_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/register_content_observers_async_flag_values.textproto
deleted file mode 100644
index 12ea9e6b..00000000
--- a/aconfig/trunk_staging/com.android.systemui/register_content_observers_async_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "register_content_observers_async"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/register_new_wallet_card_in_background_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/register_new_wallet_card_in_background_flag_values.textproto
deleted file mode 100644
index 908c0251..00000000
--- a/aconfig/trunk_staging/com.android.systemui/register_new_wallet_card_in_background_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "register_new_wallet_card_in_background"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/register_wallpaper_notifier_background_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/register_wallpaper_notifier_background_flag_values.textproto
deleted file mode 100644
index 680da1cd..00000000
--- a/aconfig/trunk_staging/com.android.systemui/register_wallpaper_notifier_background_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "register_wallpaper_notifier_background"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/register_zen_mode_content_observer_background_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/register_zen_mode_content_observer_background_flag_values.textproto
deleted file mode 100644
index 02bfc13a..00000000
--- a/aconfig/trunk_staging/com.android.systemui/register_zen_mode_content_observer_background_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "register_zen_mode_content_observer_background"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/relock_with_power_button_immediately_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/relock_with_power_button_immediately_flag_values.textproto
deleted file mode 100644
index 22058d09..00000000
--- a/aconfig/trunk_staging/com.android.systemui/relock_with_power_button_immediately_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "relock_with_power_button_immediately"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/remove_dream_overlay_hide_on_touch_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/remove_dream_overlay_hide_on_touch_flag_values.textproto
deleted file mode 100644
index 6e508387..00000000
--- a/aconfig/trunk_staging/com.android.systemui/remove_dream_overlay_hide_on_touch_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "remove_dream_overlay_hide_on_touch"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/remove_update_listener_in_qs_icon_view_impl_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/remove_update_listener_in_qs_icon_view_impl_flag_values.textproto
deleted file mode 100644
index aff40aa1..00000000
--- a/aconfig/trunk_staging/com.android.systemui/remove_update_listener_in_qs_icon_view_impl_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "remove_update_listener_in_qs_icon_view_impl"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/revamped_bouncer_messages_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/revamped_bouncer_messages_flag_values.textproto
deleted file mode 100644
index d364baa6..00000000
--- a/aconfig/trunk_staging/com.android.systemui/revamped_bouncer_messages_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "revamped_bouncer_messages"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/run_fingerprint_detect_on_dismissible_keyguard_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/run_fingerprint_detect_on_dismissible_keyguard_flag_values.textproto
deleted file mode 100644
index 3dbd2eba..00000000
--- a/aconfig/trunk_staging/com.android.systemui/run_fingerprint_detect_on_dismissible_keyguard_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "run_fingerprint_detect_on_dismissible_keyguard"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/save_and_restore_magnification_settings_buttons_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/save_and_restore_magnification_settings_buttons_flag_values.textproto
deleted file mode 100644
index 45ed38e0..00000000
--- a/aconfig/trunk_staging/com.android.systemui/save_and_restore_magnification_settings_buttons_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "save_and_restore_magnification_settings_buttons"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/screenshare_notification_hiding_bug_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/screenshare_notification_hiding_bug_fix_flag_values.textproto
deleted file mode 100644
index 26855cf0..00000000
--- a/aconfig/trunk_staging/com.android.systemui/screenshare_notification_hiding_bug_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "screenshare_notification_hiding_bug_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/screenshot_action_dismiss_system_windows_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/screenshot_action_dismiss_system_windows_flag_values.textproto
deleted file mode 100644
index 80f03a0b..00000000
--- a/aconfig/trunk_staging/com.android.systemui/screenshot_action_dismiss_system_windows_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "screenshot_action_dismiss_system_windows"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/screenshot_policy_split_and_desktop_mode_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/screenshot_policy_split_and_desktop_mode_flag_values.textproto
deleted file mode 100644
index 7fcfe053..00000000
--- a/aconfig/trunk_staging/com.android.systemui/screenshot_policy_split_and_desktop_mode_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "screenshot_policy_split_and_desktop_mode"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/screenshot_private_profile_accessibility_announcement_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/screenshot_private_profile_accessibility_announcement_fix_flag_values.textproto
deleted file mode 100644
index 19345a5a..00000000
--- a/aconfig/trunk_staging/com.android.systemui/screenshot_private_profile_accessibility_announcement_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "screenshot_private_profile_accessibility_announcement_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/screenshot_private_profile_behavior_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/screenshot_private_profile_behavior_fix_flag_values.textproto
deleted file mode 100644
index 901a9951..00000000
--- a/aconfig/trunk_staging/com.android.systemui/screenshot_private_profile_behavior_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "screenshot_private_profile_behavior_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/screenshot_save_image_exporter_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/screenshot_save_image_exporter_flag_values.textproto
deleted file mode 100644
index e17529a4..00000000
--- a/aconfig/trunk_staging/com.android.systemui/screenshot_save_image_exporter_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "screenshot_save_image_exporter"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/screenshot_scroll_crop_view_crash_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/screenshot_scroll_crop_view_crash_fix_flag_values.textproto
deleted file mode 100644
index 5ed03ee4..00000000
--- a/aconfig/trunk_staging/com.android.systemui/screenshot_scroll_crop_view_crash_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "screenshot_scroll_crop_view_crash_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/screenshot_shelf_ui2_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/screenshot_shelf_ui2_flag_values.textproto
deleted file mode 100644
index 9070838c..00000000
--- a/aconfig/trunk_staging/com.android.systemui/screenshot_shelf_ui2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "screenshot_shelf_ui2"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/screenshot_ui_controller_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/screenshot_ui_controller_refactor_flag_values.textproto
deleted file mode 100644
index f53533bc..00000000
--- a/aconfig/trunk_staging/com.android.systemui/screenshot_ui_controller_refactor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "screenshot_ui_controller_refactor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/settings_ext_register_content_observer_on_bg_thread_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/settings_ext_register_content_observer_on_bg_thread_flag_values.textproto
deleted file mode 100644
index 206076c2..00000000
--- a/aconfig/trunk_staging/com.android.systemui/settings_ext_register_content_observer_on_bg_thread_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "settings_ext_register_content_observer_on_bg_thread"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/shade_expands_on_status_bar_long_press_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/shade_expands_on_status_bar_long_press_flag_values.textproto
deleted file mode 100644
index 6af1dd14..00000000
--- a/aconfig/trunk_staging/com.android.systemui/shade_expands_on_status_bar_long_press_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "shade_expands_on_status_bar_long_press"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/shade_launch_accessibility_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/shade_launch_accessibility_flag_values.textproto
deleted file mode 100644
index ea7944ef..00000000
--- a/aconfig/trunk_staging/com.android.systemui/shade_launch_accessibility_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "shade_launch_accessibility"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/shade_window_goes_around_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/shade_window_goes_around_flag_values.textproto
deleted file mode 100644
index 61948468..00000000
--- a/aconfig/trunk_staging/com.android.systemui/shade_window_goes_around_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "shade_window_goes_around"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/shaderlib_loading_effect_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/shaderlib_loading_effect_refactor_flag_values.textproto
deleted file mode 100644
index ac5af8a3..00000000
--- a/aconfig/trunk_staging/com.android.systemui/shaderlib_loading_effect_refactor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "shaderlib_loading_effect_refactor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/shortcut_helper_key_glyph_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/shortcut_helper_key_glyph_flag_values.textproto
deleted file mode 100644
index 61158aa5..00000000
--- a/aconfig/trunk_staging/com.android.systemui/shortcut_helper_key_glyph_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "shortcut_helper_key_glyph"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/show_audio_sharing_slider_in_volume_panel_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/show_audio_sharing_slider_in_volume_panel_flag_values.textproto
deleted file mode 100644
index 743b3387..00000000
--- a/aconfig/trunk_staging/com.android.systemui/show_audio_sharing_slider_in_volume_panel_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "show_audio_sharing_slider_in_volume_panel"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/show_toast_when_app_control_brightness_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/show_toast_when_app_control_brightness_flag_values.textproto
deleted file mode 100644
index e2a9e291..00000000
--- a/aconfig/trunk_staging/com.android.systemui/show_toast_when_app_control_brightness_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "show_toast_when_app_control_brightness"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/sim_pin_bouncer_reset_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/sim_pin_bouncer_reset_flag_values.textproto
deleted file mode 100644
index 3a00b242..00000000
--- a/aconfig/trunk_staging/com.android.systemui/sim_pin_bouncer_reset_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "sim_pin_bouncer_reset"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/sim_pin_race_condition_on_restart_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/sim_pin_race_condition_on_restart_flag_values.textproto
deleted file mode 100644
index 8d8829ea..00000000
--- a/aconfig/trunk_staging/com.android.systemui/sim_pin_race_condition_on_restart_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "sim_pin_race_condition_on_restart"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/sim_pin_talkback_fix_for_double_submit_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/sim_pin_talkback_fix_for_double_submit_flag_values.textproto
deleted file mode 100644
index 6c151f2e..00000000
--- a/aconfig/trunk_staging/com.android.systemui/sim_pin_talkback_fix_for_double_submit_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "sim_pin_talkback_fix_for_double_submit"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/sim_pin_use_slot_id_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/sim_pin_use_slot_id_flag_values.textproto
deleted file mode 100644
index cea64b0c..00000000
--- a/aconfig/trunk_staging/com.android.systemui/sim_pin_use_slot_id_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "sim_pin_use_slot_id"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/skip_hide_sensitive_notif_animation_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/skip_hide_sensitive_notif_animation_flag_values.textproto
deleted file mode 100644
index cff06a32..00000000
--- a/aconfig/trunk_staging/com.android.systemui/skip_hide_sensitive_notif_animation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "skip_hide_sensitive_notif_animation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/slice_broadcast_relay_in_background_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/slice_broadcast_relay_in_background_flag_values.textproto
deleted file mode 100644
index e45e00a2..00000000
--- a/aconfig/trunk_staging/com.android.systemui/slice_broadcast_relay_in_background_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "slice_broadcast_relay_in_background"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/slice_manager_binder_call_background_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/slice_manager_binder_call_background_flag_values.textproto
deleted file mode 100644
index 01db2ac7..00000000
--- a/aconfig/trunk_staging/com.android.systemui/slice_manager_binder_call_background_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "slice_manager_binder_call_background"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/smartspace_lockscreen_viewmodel_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/smartspace_lockscreen_viewmodel_flag_values.textproto
deleted file mode 100644
index c19b7159..00000000
--- a/aconfig/trunk_staging/com.android.systemui/smartspace_lockscreen_viewmodel_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "smartspace_lockscreen_viewmodel"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/smartspace_remoteviews_rendering_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/smartspace_remoteviews_rendering_fix_flag_values.textproto
deleted file mode 100644
index 948cb9c8..00000000
--- a/aconfig/trunk_staging/com.android.systemui/smartspace_remoteviews_rendering_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "smartspace_remoteviews_rendering_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/smartspace_swipe_event_logging_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/smartspace_swipe_event_logging_fix_flag_values.textproto
deleted file mode 100644
index cfaf9020..00000000
--- a/aconfig/trunk_staging/com.android.systemui/smartspace_swipe_event_logging_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "smartspace_swipe_event_logging_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/smartspace_viewpager2_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/smartspace_viewpager2_flag_values.textproto
deleted file mode 100644
index fe481d27..00000000
--- a/aconfig/trunk_staging/com.android.systemui/smartspace_viewpager2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "smartspace_viewpager2"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/sounddose_customization_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/sounddose_customization_flag_values.textproto
deleted file mode 100644
index 0c1e0f21..00000000
--- a/aconfig/trunk_staging/com.android.systemui/sounddose_customization_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "sounddose_customization"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/spatial_model_app_pushback_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/spatial_model_app_pushback_flag_values.textproto
deleted file mode 100644
index f60e7bda..00000000
--- a/aconfig/trunk_staging/com.android.systemui/spatial_model_app_pushback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "spatial_model_app_pushback"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/stabilize_heads_up_group_v2_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/stabilize_heads_up_group_v2_flag_values.textproto
deleted file mode 100644
index 29cd280b..00000000
--- a/aconfig/trunk_staging/com.android.systemui/stabilize_heads_up_group_v2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "stabilize_heads_up_group_v2"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/status_bar_always_check_underlying_networks_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/status_bar_always_check_underlying_networks_flag_values.textproto
deleted file mode 100644
index 39ff849f..00000000
--- a/aconfig/trunk_staging/com.android.systemui/status_bar_always_check_underlying_networks_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "status_bar_always_check_underlying_networks"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/status_bar_auto_start_screen_record_chip_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/status_bar_auto_start_screen_record_chip_flag_values.textproto
deleted file mode 100644
index 28216fe9..00000000
--- a/aconfig/trunk_staging/com.android.systemui/status_bar_auto_start_screen_record_chip_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "status_bar_auto_start_screen_record_chip"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/status_bar_call_chip_notification_icon_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/status_bar_call_chip_notification_icon_flag_values.textproto
deleted file mode 100644
index d8c7740c..00000000
--- a/aconfig/trunk_staging/com.android.systemui/status_bar_call_chip_notification_icon_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "status_bar_call_chip_notification_icon"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/status_bar_chips_modernization_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/status_bar_chips_modernization_flag_values.textproto
deleted file mode 100644
index f54b3807..00000000
--- a/aconfig/trunk_staging/com.android.systemui/status_bar_chips_modernization_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "status_bar_chips_modernization"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/status_bar_chips_return_animations_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/status_bar_chips_return_animations_flag_values.textproto
deleted file mode 100644
index cdb990e7..00000000
--- a/aconfig/trunk_staging/com.android.systemui/status_bar_chips_return_animations_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "status_bar_chips_return_animations"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/status_bar_font_updates_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/status_bar_font_updates_flag_values.textproto
deleted file mode 100644
index 48f4cf82..00000000
--- a/aconfig/trunk_staging/com.android.systemui/status_bar_font_updates_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "status_bar_font_updates"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/status_bar_monochrome_icons_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/status_bar_monochrome_icons_fix_flag_values.textproto
deleted file mode 100644
index 39cff133..00000000
--- a/aconfig/trunk_staging/com.android.systemui/status_bar_monochrome_icons_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "status_bar_monochrome_icons_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/status_bar_no_hun_behavior_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/status_bar_no_hun_behavior_flag_values.textproto
deleted file mode 100644
index fd680849..00000000
--- a/aconfig/trunk_staging/com.android.systemui/status_bar_no_hun_behavior_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "status_bar_no_hun_behavior"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/status_bar_notification_chips_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/status_bar_notification_chips_flag_values.textproto
deleted file mode 100644
index 1bd7f495..00000000
--- a/aconfig/trunk_staging/com.android.systemui/status_bar_notification_chips_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "status_bar_notification_chips"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/status_bar_root_modernization_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/status_bar_root_modernization_flag_values.textproto
deleted file mode 100644
index c2bfdc8f..00000000
--- a/aconfig/trunk_staging/com.android.systemui/status_bar_root_modernization_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "status_bar_root_modernization"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/status_bar_screen_sharing_chips_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/status_bar_screen_sharing_chips_flag_values.textproto
deleted file mode 100644
index 921430c5..00000000
--- a/aconfig/trunk_staging/com.android.systemui/status_bar_screen_sharing_chips_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "status_bar_screen_sharing_chips"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/status_bar_show_audio_only_projection_chip_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/status_bar_show_audio_only_projection_chip_flag_values.textproto
deleted file mode 100644
index 55f96b5c..00000000
--- a/aconfig/trunk_staging/com.android.systemui/status_bar_show_audio_only_projection_chip_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "status_bar_show_audio_only_projection_chip"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/status_bar_signal_policy_refactor_ethernet_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/status_bar_signal_policy_refactor_ethernet_flag_values.textproto
deleted file mode 100644
index 28448297..00000000
--- a/aconfig/trunk_staging/com.android.systemui/status_bar_signal_policy_refactor_ethernet_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "status_bar_signal_policy_refactor_ethernet"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/status_bar_signal_policy_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/status_bar_signal_policy_refactor_flag_values.textproto
deleted file mode 100644
index 355e2a81..00000000
--- a/aconfig/trunk_staging/com.android.systemui/status_bar_signal_policy_refactor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "status_bar_signal_policy_refactor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/status_bar_swipe_over_chip_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/status_bar_swipe_over_chip_flag_values.textproto
deleted file mode 100644
index e6c0d548..00000000
--- a/aconfig/trunk_staging/com.android.systemui/status_bar_swipe_over_chip_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "status_bar_swipe_over_chip"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/status_bar_switch_to_spn_from_data_spn_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/status_bar_switch_to_spn_from_data_spn_flag_values.textproto
deleted file mode 100644
index e1c3874c..00000000
--- a/aconfig/trunk_staging/com.android.systemui/status_bar_switch_to_spn_from_data_spn_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "status_bar_switch_to_spn_from_data_spn"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/status_bar_use_repos_for_call_chip_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/status_bar_use_repos_for_call_chip_flag_values.textproto
deleted file mode 100644
index 0dbce5c6..00000000
--- a/aconfig/trunk_staging/com.android.systemui/status_bar_use_repos_for_call_chip_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "status_bar_use_repos_for_call_chip"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/stoppable_fgs_system_app_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/stoppable_fgs_system_app_flag_values.textproto
deleted file mode 100644
index e7f093a0..00000000
--- a/aconfig/trunk_staging/com.android.systemui/stoppable_fgs_system_app_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "stoppable_fgs_system_app"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/switch_user_on_bg_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/switch_user_on_bg_flag_values.textproto
deleted file mode 100644
index ebaac852..00000000
--- a/aconfig/trunk_staging/com.android.systemui/switch_user_on_bg_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "switch_user_on_bg"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/sysui_teamfood_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/sysui_teamfood_flag_values.textproto
deleted file mode 100644
index 19bb0fe9..00000000
--- a/aconfig/trunk_staging/com.android.systemui/sysui_teamfood_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "sysui_teamfood"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/transition_race_condition_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/transition_race_condition_flag_values.textproto
deleted file mode 100644
index 08499424..00000000
--- a/aconfig/trunk_staging/com.android.systemui/transition_race_condition_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "transition_race_condition"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/translucent_occluding_activity_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/translucent_occluding_activity_fix_flag_values.textproto
deleted file mode 100644
index d8d5bccb..00000000
--- a/aconfig/trunk_staging/com.android.systemui/translucent_occluding_activity_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "translucent_occluding_activity_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/truncated_status_bar_icons_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/truncated_status_bar_icons_fix_flag_values.textproto
deleted file mode 100644
index d43a77e8..00000000
--- a/aconfig/trunk_staging/com.android.systemui/truncated_status_bar_icons_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "truncated_status_bar_icons_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/udfps_view_performance_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/udfps_view_performance_flag_values.textproto
deleted file mode 100644
index c33745ad..00000000
--- a/aconfig/trunk_staging/com.android.systemui/udfps_view_performance_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "udfps_view_performance"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/unfold_animation_background_progress_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/unfold_animation_background_progress_flag_values.textproto
deleted file mode 100644
index 1047c5de..00000000
--- a/aconfig/trunk_staging/com.android.systemui/unfold_animation_background_progress_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "unfold_animation_background_progress"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/unfold_latency_tracking_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/unfold_latency_tracking_fix_flag_values.textproto
deleted file mode 100644
index 035f5da9..00000000
--- a/aconfig/trunk_staging/com.android.systemui/unfold_latency_tracking_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "unfold_latency_tracking_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/update_corner_radius_on_display_changed_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/update_corner_radius_on_display_changed_flag_values.textproto
deleted file mode 100644
index 991fcf64..00000000
--- a/aconfig/trunk_staging/com.android.systemui/update_corner_radius_on_display_changed_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "update_corner_radius_on_display_changed"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/update_user_switcher_background_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/update_user_switcher_background_flag_values.textproto
deleted file mode 100644
index 82182ab4..00000000
--- a/aconfig/trunk_staging/com.android.systemui/update_user_switcher_background_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "update_user_switcher_background"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/update_window_magnifier_bottom_boundary_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/update_window_magnifier_bottom_boundary_flag_values.textproto
deleted file mode 100644
index 2fa3f70f..00000000
--- a/aconfig/trunk_staging/com.android.systemui/update_window_magnifier_bottom_boundary_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "update_window_magnifier_bottom_boundary"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/use_notif_inflation_thread_for_footer_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/use_notif_inflation_thread_for_footer_flag_values.textproto
deleted file mode 100644
index 8d5ac333..00000000
--- a/aconfig/trunk_staging/com.android.systemui/use_notif_inflation_thread_for_footer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "use_notif_inflation_thread_for_footer"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/use_notif_inflation_thread_for_row_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/use_notif_inflation_thread_for_row_flag_values.textproto
deleted file mode 100644
index fd9ba88c..00000000
--- a/aconfig/trunk_staging/com.android.systemui/use_notif_inflation_thread_for_row_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "use_notif_inflation_thread_for_row"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/use_transitions_for_keyguard_occluded_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/use_transitions_for_keyguard_occluded_flag_values.textproto
deleted file mode 100644
index afe9aad8..00000000
--- a/aconfig/trunk_staging/com.android.systemui/use_transitions_for_keyguard_occluded_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "use_transitions_for_keyguard_occluded"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/use_volume_controller_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/use_volume_controller_flag_values.textproto
deleted file mode 100644
index 76e77886..00000000
--- a/aconfig/trunk_staging/com.android.systemui/use_volume_controller_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "use_volume_controller"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/user_aware_settings_repositories_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/user_aware_settings_repositories_flag_values.textproto
deleted file mode 100644
index f95d0908..00000000
--- a/aconfig/trunk_staging/com.android.systemui/user_aware_settings_repositories_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "user_aware_settings_repositories"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/user_encrypted_source_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/user_encrypted_source_flag_values.textproto
deleted file mode 100644
index fbf61e49..00000000
--- a/aconfig/trunk_staging/com.android.systemui/user_encrypted_source_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "user_encrypted_source"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/user_switcher_add_sign_out_option_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/user_switcher_add_sign_out_option_flag_values.textproto
deleted file mode 100644
index 686364d8..00000000
--- a/aconfig/trunk_staging/com.android.systemui/user_switcher_add_sign_out_option_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "user_switcher_add_sign_out_option"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/validate_keyboard_shortcut_helper_icon_uri_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/validate_keyboard_shortcut_helper_icon_uri_flag_values.textproto
deleted file mode 100644
index bdee5b49..00000000
--- a/aconfig/trunk_staging/com.android.systemui/validate_keyboard_shortcut_helper_icon_uri_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "validate_keyboard_shortcut_helper_icon_uri"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/visual_interruptions_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/visual_interruptions_refactor_flag_values.textproto
deleted file mode 100644
index 21f09339..00000000
--- a/aconfig/trunk_staging/com.android.systemui/visual_interruptions_refactor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "visual_interruptions_refactor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/volume_redesign_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/volume_redesign_flag_values.textproto
deleted file mode 100644
index 5db9ab45..00000000
--- a/aconfig/trunk_staging/com.android.systemui/volume_redesign_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "volume_redesign"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.telephony.phone.flags/Android.bp b/aconfig/trunk_staging/com.android.telephony.phone.flags/Android.bp
deleted file mode 100644
index 8bd2b80b..00000000
--- a/aconfig/trunk_staging/com.android.telephony.phone.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.android.telephony.phone.flags-all",
-  package: "com.android.telephony.phone.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/Android.bp b/aconfig/trunk_staging/com.android.text.flags/Android.bp
deleted file mode 100644
index 4d6ffb7f..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.text.flags-all",
-    package: "com.android.text.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/clear_font_variation_settings_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/clear_font_variation_settings_flag_values.textproto
deleted file mode 100644
index fee92283..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/clear_font_variation_settings_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "clear_font_variation_settings"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/complete_font_load_in_system_services_ready_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/complete_font_load_in_system_services_ready_flag_values.textproto
deleted file mode 100644
index fd313a8f..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/complete_font_load_in_system_services_ready_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "complete_font_load_in_system_services_ready"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/context_menu_hide_unavailable_items_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/context_menu_hide_unavailable_items_flag_values.textproto
deleted file mode 100644
index 1ab7e5d3..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/context_menu_hide_unavailable_items_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "context_menu_hide_unavailable_items"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/deprecate_elegant_text_height_api_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/deprecate_elegant_text_height_api_flag_values.textproto
deleted file mode 100644
index 6f066fd7..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/deprecate_elegant_text_height_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "deprecate_elegant_text_height_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/deprecate_ui_fonts_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/deprecate_ui_fonts_flag_values.textproto
deleted file mode 100644
index da2950d9..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/deprecate_ui_fonts_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "deprecate_ui_fonts"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/disable_handwriting_initiator_for_ime_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/disable_handwriting_initiator_for_ime_flag_values.textproto
deleted file mode 100644
index 97650ea5..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/disable_handwriting_initiator_for_ime_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "disable_handwriting_initiator_for_ime"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/escape_clears_focus_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/escape_clears_focus_flag_values.textproto
deleted file mode 100644
index 92f3d752..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/escape_clears_focus_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "escape_clears_focus"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/fix_double_underline_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/fix_double_underline_flag_values.textproto
deleted file mode 100644
index 00bdaceb..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/fix_double_underline_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "fix_double_underline"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/fix_font_update_failure_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/fix_font_update_failure_flag_values.textproto
deleted file mode 100644
index ce278209..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/fix_font_update_failure_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "fix_font_update_failure"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/fix_line_height_for_locale_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/fix_line_height_for_locale_flag_values.textproto
deleted file mode 100644
index 89fe3f4b..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/fix_line_height_for_locale_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "fix_line_height_for_locale"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/fix_misaligned_context_menu_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/fix_misaligned_context_menu_flag_values.textproto
deleted file mode 100644
index 7b4476ab..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/fix_misaligned_context_menu_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "fix_misaligned_context_menu"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/fix_null_typeface_bolding_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/fix_null_typeface_bolding_flag_values.textproto
deleted file mode 100644
index 2246b7c1..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/fix_null_typeface_bolding_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "fix_null_typeface_bolding"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/handwriting_cursor_position_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/handwriting_cursor_position_flag_values.textproto
deleted file mode 100644
index de784d4e..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/handwriting_cursor_position_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "handwriting_cursor_position"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/handwriting_end_of_line_tap_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/handwriting_end_of_line_tap_flag_values.textproto
deleted file mode 100644
index eac0a06c..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/handwriting_end_of_line_tap_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "handwriting_end_of_line_tap"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/handwriting_gesture_with_transformation_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/handwriting_gesture_with_transformation_flag_values.textproto
deleted file mode 100644
index 512b8dae..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/handwriting_gesture_with_transformation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "handwriting_gesture_with_transformation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/handwriting_track_disabled_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/handwriting_track_disabled_flag_values.textproto
deleted file mode 100644
index 76615104..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/handwriting_track_disabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "handwriting_track_disabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/handwriting_unsupported_message_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/handwriting_unsupported_message_flag_values.textproto
deleted file mode 100644
index 2a2ef141..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/handwriting_unsupported_message_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "handwriting_unsupported_message"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/handwriting_unsupported_show_soft_input_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/handwriting_unsupported_show_soft_input_fix_flag_values.textproto
deleted file mode 100644
index 77e92df7..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/handwriting_unsupported_show_soft_input_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "handwriting_unsupported_show_soft_input_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/icu_bidi_migration_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/icu_bidi_migration_flag_values.textproto
deleted file mode 100644
index f592eba7..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/icu_bidi_migration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "icu_bidi_migration"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/insert_mode_crash_update_layout_span_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/insert_mode_crash_update_layout_span_flag_values.textproto
deleted file mode 100644
index 6b08c37f..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/insert_mode_crash_update_layout_span_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "insert_mode_crash_update_layout_span"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/insert_mode_crash_when_delete_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/insert_mode_crash_when_delete_flag_values.textproto
deleted file mode 100644
index 9f0d38ec..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/insert_mode_crash_when_delete_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "insert_mode_crash_when_delete"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/insert_mode_highlight_range_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/insert_mode_highlight_range_flag_values.textproto
deleted file mode 100644
index 714741b2..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/insert_mode_highlight_range_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "insert_mode_highlight_range"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/lazy_variation_instance_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/lazy_variation_instance_flag_values.textproto
deleted file mode 100644
index 98b9d3af..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/lazy_variation_instance_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "lazy_variation_instance"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/letter_spacing_justification_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/letter_spacing_justification_flag_values.textproto
deleted file mode 100644
index 88d8f783..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/letter_spacing_justification_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "letter_spacing_justification"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/new_fonts_fallback_xml_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/new_fonts_fallback_xml_flag_values.textproto
deleted file mode 100644
index 162780c1..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/new_fonts_fallback_xml_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "new_fonts_fallback_xml"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/no_break_no_hyphenation_span_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/no_break_no_hyphenation_span_flag_values.textproto
deleted file mode 100644
index 5022db16..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/no_break_no_hyphenation_span_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "no_break_no_hyphenation_span"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/phrase_strict_fallback_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/phrase_strict_fallback_flag_values.textproto
deleted file mode 100644
index 714c437a..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/phrase_strict_fallback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "phrase_strict_fallback"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/portuguese_hyphenator_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/portuguese_hyphenator_flag_values.textproto
deleted file mode 100644
index 666caeca..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/portuguese_hyphenator_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "portuguese_hyphenator"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/rust_hyphenator_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/rust_hyphenator_flag_values.textproto
deleted file mode 100644
index 6629fd68..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/rust_hyphenator_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "rust_hyphenator"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/tts_span_duration_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/tts_span_duration_flag_values.textproto
deleted file mode 100644
index d038d3ea..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/tts_span_duration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "tts_span_duration"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/typeface_redesign_readonly_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/typeface_redesign_readonly_flag_values.textproto
deleted file mode 100644
index 828201a3..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/typeface_redesign_readonly_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "typeface_redesign_readonly"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/use_bounds_for_width_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/use_bounds_for_width_flag_values.textproto
deleted file mode 100644
index c3ee9931..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/use_bounds_for_width_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "use_bounds_for_width"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/use_optimized_boottime_font_loading_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/use_optimized_boottime_font_loading_flag_values.textproto
deleted file mode 100644
index 7164a15d..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/use_optimized_boottime_font_loading_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "use_optimized_boottime_font_loading"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/vendor_custom_locale_fallback_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/vendor_custom_locale_fallback_flag_values.textproto
deleted file mode 100644
index 5958a97f..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/vendor_custom_locale_fallback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "vendor_custom_locale_fallback"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/vertical_text_layout_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/vertical_text_layout_flag_values.textproto
deleted file mode 100644
index a44cea43..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/vertical_text_layout_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "vertical_text_layout"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/word_style_auto_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/word_style_auto_flag_values.textproto
deleted file mode 100644
index cf2bdc46..00000000
--- a/aconfig/trunk_staging/com.android.text.flags/word_style_auto_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "word_style_auto"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.tradeinmode.flags/Android.bp b/aconfig/trunk_staging/com.android.tradeinmode.flags/Android.bp
deleted file mode 100644
index 765c8c4a..00000000
--- a/aconfig/trunk_staging/com.android.tradeinmode.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.tradeinmode.flags-all",
-    package: "com.android.tradeinmode.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.tradeinmode.flags/enable_trade_in_mode_flag_values.textproto b/aconfig/trunk_staging/com.android.tradeinmode.flags/enable_trade_in_mode_flag_values.textproto
deleted file mode 100644
index d9a4088d..00000000
--- a/aconfig/trunk_staging/com.android.tradeinmode.flags/enable_trade_in_mode_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.tradeinmode.flags"
-  name: "enable_trade_in_mode"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.trunk_stable_workflow_testing/Android.bp b/aconfig/trunk_staging/com.android.trunk_stable_workflow_testing/Android.bp
deleted file mode 100644
index 783de585..00000000
--- a/aconfig/trunk_staging/com.android.trunk_stable_workflow_testing/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.trunk_stable_workflow_testing-all",
-    package: "com.android.trunk_stable_workflow_testing",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.trunk_stable_workflow_testing/test_migrate_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.trunk_stable_workflow_testing/test_migrate_flag_flag_values.textproto
deleted file mode 100644
index d59227e6..00000000
--- a/aconfig/trunk_staging/com.android.trunk_stable_workflow_testing/test_migrate_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.trunk_stable_workflow_testing"
-  name: "test_migrate_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.uwb.flags/Android.bp b/aconfig/trunk_staging/com.android.uwb.flags/Android.bp
deleted file mode 100644
index 31e82ca4..00000000
--- a/aconfig/trunk_staging/com.android.uwb.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.uwb.flags-all",
-    package: "com.android.uwb.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.uwb.flags/cr423_cleanup_interval_scheduling_flag_values.textproto b/aconfig/trunk_staging/com.android.uwb.flags/cr423_cleanup_interval_scheduling_flag_values.textproto
deleted file mode 100644
index 6cf507a5..00000000
--- a/aconfig/trunk_staging/com.android.uwb.flags/cr423_cleanup_interval_scheduling_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.uwb.flags"
-  name: "cr423_cleanup_interval_scheduling"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.uwb.flags/data_transfer_phase_config_flag_values.textproto b/aconfig/trunk_staging/com.android.uwb.flags/data_transfer_phase_config_flag_values.textproto
deleted file mode 100644
index 04853eef..00000000
--- a/aconfig/trunk_staging/com.android.uwb.flags/data_transfer_phase_config_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.uwb.flags"
-  name: "data_transfer_phase_config"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.uwb.flags/hw_state_flag_values.textproto b/aconfig/trunk_staging/com.android.uwb.flags/hw_state_flag_values.textproto
deleted file mode 100644
index 9c56662c..00000000
--- a/aconfig/trunk_staging/com.android.uwb.flags/hw_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.uwb.flags"
-  name: "hw_state"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.uwb.flags/hybrid_session_support_flag_values.textproto b/aconfig/trunk_staging/com.android.uwb.flags/hybrid_session_support_flag_values.textproto
deleted file mode 100644
index 0aa5a311..00000000
--- a/aconfig/trunk_staging/com.android.uwb.flags/hybrid_session_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.uwb.flags"
-  name: "hybrid_session_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.uwb.flags/parse_cap_tlv_rust_uses_uwbs_uci_version_flag_values.textproto b/aconfig/trunk_staging/com.android.uwb.flags/parse_cap_tlv_rust_uses_uwbs_uci_version_flag_values.textproto
deleted file mode 100644
index c97fdd10..00000000
--- a/aconfig/trunk_staging/com.android.uwb.flags/parse_cap_tlv_rust_uses_uwbs_uci_version_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.uwb.flags"
-  name: "parse_cap_tlv_rust_uses_uwbs_uci_version"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.uwb.flags/query_timestamp_micros_flag_values.textproto b/aconfig/trunk_staging/com.android.uwb.flags/query_timestamp_micros_flag_values.textproto
deleted file mode 100644
index 60a971e1..00000000
--- a/aconfig/trunk_staging/com.android.uwb.flags/query_timestamp_micros_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.uwb.flags"
-  name: "query_timestamp_micros"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.uwb.flags/reason_inband_session_stop_flag_values.textproto b/aconfig/trunk_staging/com.android.uwb.flags/reason_inband_session_stop_flag_values.textproto
deleted file mode 100644
index 27f4c4b2..00000000
--- a/aconfig/trunk_staging/com.android.uwb.flags/reason_inband_session_stop_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.uwb.flags"
-  name: "reason_inband_session_stop"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.uwb.flags/use_network_country_iso_flag_values.textproto b/aconfig/trunk_staging/com.android.uwb.flags/use_network_country_iso_flag_values.textproto
deleted file mode 100644
index 9484cdcc..00000000
--- a/aconfig/trunk_staging/com.android.uwb.flags/use_network_country_iso_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.uwb.flags"
-  name: "use_network_country_iso"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.uwb.flags/use_uwbs_uci_version_flag_values.textproto b/aconfig/trunk_staging/com.android.uwb.flags/use_uwbs_uci_version_flag_values.textproto
deleted file mode 100644
index 2f52bd80..00000000
--- a/aconfig/trunk_staging/com.android.uwb.flags/use_uwbs_uci_version_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.uwb.flags"
-  name: "use_uwbs_uci_version"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wallpaper/Android.bp b/aconfig/trunk_staging/com.android.wallpaper/Android.bp
deleted file mode 100644
index 99a06393..00000000
--- a/aconfig/trunk_staging/com.android.wallpaper/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.wallpaper-all",
-    package: "com.android.wallpaper",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.wallpaper/new_creative_wallpaper_category_flag_values.textproto b/aconfig/trunk_staging/com.android.wallpaper/new_creative_wallpaper_category_flag_values.textproto
deleted file mode 100644
index 45558135..00000000
--- a/aconfig/trunk_staging/com.android.wallpaper/new_creative_wallpaper_category_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wallpaper"
-  name: "new_creative_wallpaper_category"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wallpaper/refactor_wallpaper_category_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.wallpaper/refactor_wallpaper_category_flag_flag_values.textproto
deleted file mode 100644
index e75506d4..00000000
--- a/aconfig/trunk_staging/com.android.wallpaper/refactor_wallpaper_category_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wallpaper"
-  name: "refactor_wallpaper_category_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wallpaper/wallpaper_restorer_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.wallpaper/wallpaper_restorer_flag_flag_values.textproto
deleted file mode 100644
index b6ea7c3b..00000000
--- a/aconfig/trunk_staging/com.android.wallpaper/wallpaper_restorer_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wallpaper"
-  name: "wallpaper_restorer_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/Android.bp b/aconfig/trunk_staging/com.android.wifi.flags/Android.bp
deleted file mode 100644
index 808e8027..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.wifi.flags-all",
-    package: "com.android.wifi.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/android_v_wifi_api_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/android_v_wifi_api_flag_values.textproto
deleted file mode 100644
index 49e2ff82..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/android_v_wifi_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "android_v_wifi_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/ap_isolate_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/ap_isolate_flag_values.textproto
deleted file mode 100644
index f91fc566..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/ap_isolate_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "ap_isolate"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/autojoin_restriction_security_types_api_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/autojoin_restriction_security_types_api_flag_values.textproto
deleted file mode 100644
index 568a143b..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/autojoin_restriction_security_types_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "autojoin_restriction_security_types_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/aware_pairing_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/aware_pairing_flag_values.textproto
deleted file mode 100644
index ce2817bd..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/aware_pairing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "aware_pairing"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/bssid_blocklist_for_suggestion_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/bssid_blocklist_for_suggestion_flag_values.textproto
deleted file mode 100644
index 882d04be..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/bssid_blocklist_for_suggestion_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "bssid_blocklist_for_suggestion"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/get_bssid_blocklist_api_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/get_bssid_blocklist_api_flag_values.textproto
deleted file mode 100644
index c1b4d735..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/get_bssid_blocklist_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "get_bssid_blocklist_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/get_channel_width_api_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/get_channel_width_api_flag_values.textproto
deleted file mode 100644
index 3f517dc9..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/get_channel_width_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "get_channel_width_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/local_only_connection_optimization_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/local_only_connection_optimization_flag_values.textproto
deleted file mode 100644
index d6c7b436..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/local_only_connection_optimization_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "local_only_connection_optimization"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/mainline_supplicant_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/mainline_supplicant_flag_values.textproto
deleted file mode 100644
index e74f0ad5..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/mainline_supplicant_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "mainline_supplicant"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/mlo_sap_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/mlo_sap_flag_values.textproto
deleted file mode 100644
index be64db2a..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/mlo_sap_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "mlo_sap"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/multiple_mld_on_sap_supported_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/multiple_mld_on_sap_supported_flag_values.textproto
deleted file mode 100644
index a356c4f6..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/multiple_mld_on_sap_supported_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "multiple_mld_on_sap_supported"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/network_provider_battery_charging_status_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/network_provider_battery_charging_status_flag_values.textproto
deleted file mode 100644
index b9d4c746..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/network_provider_battery_charging_status_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "network_provider_battery_charging_status"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/new_uri_parsing_for_escape_character_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/new_uri_parsing_for_escape_character_flag_values.textproto
deleted file mode 100644
index e4581f9e..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/new_uri_parsing_for_escape_character_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "new_uri_parsing_for_escape_character"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/public_bands_for_lohs_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/public_bands_for_lohs_flag_values.textproto
deleted file mode 100644
index b7f41513..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/public_bands_for_lohs_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "public_bands_for_lohs"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/rsn_overriding_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/rsn_overriding_flag_values.textproto
deleted file mode 100644
index acfe8a8d..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/rsn_overriding_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "rsn_overriding"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/secure_ranging_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/secure_ranging_flag_values.textproto
deleted file mode 100644
index 0971ac4e..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/secure_ranging_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "secure_ranging"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/shared_connectivity_broadcast_receiver_test_api_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/shared_connectivity_broadcast_receiver_test_api_flag_values.textproto
deleted file mode 100644
index c96f11e9..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/shared_connectivity_broadcast_receiver_test_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "shared_connectivity_broadcast_receiver_test_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/softap_config_store_max_channel_width_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/softap_config_store_max_channel_width_flag_values.textproto
deleted file mode 100644
index 620b456d..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/softap_config_store_max_channel_width_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "softap_config_store_max_channel_width"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/softap_disconnect_reason_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/softap_disconnect_reason_flag_values.textproto
deleted file mode 100644
index 50d81bb2..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/softap_disconnect_reason_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "softap_disconnect_reason"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/voip_detection_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/voip_detection_bugfix_flag_values.textproto
deleted file mode 100644
index 30fc3e5a..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/voip_detection_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "voip_detection_bugfix"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/wep_disabled_in_apm_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/wep_disabled_in_apm_flag_values.textproto
deleted file mode 100644
index 1eb125b5..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/wep_disabled_in_apm_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "wep_disabled_in_apm"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/wifi_direct_r2_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/wifi_direct_r2_flag_values.textproto
deleted file mode 100644
index 34af4b88..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/wifi_direct_r2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "wifi_direct_r2"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/wifi_scorer_new_stats_collection_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/wifi_scorer_new_stats_collection_flag_values.textproto
deleted file mode 100644
index 93e82042..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/wifi_scorer_new_stats_collection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "wifi_scorer_new_stats_collection"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/wifi_state_changed_listener_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/wifi_state_changed_listener_flag_values.textproto
deleted file mode 100644
index 5bf56c49..00000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/wifi_state_changed_listener_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "wifi_state_changed_listener"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/Android.bp b/aconfig/trunk_staging/com.android.window.flags/Android.bp
deleted file mode 100644
index 6d10193f..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.window.flags-all",
-    package: "com.android.window.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/TEST_MAPPING b/aconfig/trunk_staging/com.android.window.flags/TEST_MAPPING
deleted file mode 100644
index d0592d17..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/TEST_MAPPING
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "imports": [
-    {
-      "path": "frameworks/native"
-    },
-    {
-      "path": "frameworks/native/services/surfaceflinger"
-    }
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/action_mode_edge_to_edge_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/action_mode_edge_to_edge_flag_values.textproto
deleted file mode 100644
index 2c1b981a..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/action_mode_edge_to_edge_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "action_mode_edge_to_edge"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/activity_embedding_animation_customization_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/activity_embedding_animation_customization_flag_flag_values.textproto
deleted file mode 100644
index 39e6cd84..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/activity_embedding_animation_customization_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "activity_embedding_animation_customization_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/activity_embedding_delay_task_fragment_finish_for_activity_launch_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/activity_embedding_delay_task_fragment_finish_for_activity_launch_flag_values.textproto
deleted file mode 100644
index bac7b7e6..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/activity_embedding_delay_task_fragment_finish_for_activity_launch_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "activity_embedding_delay_task_fragment_finish_for_activity_launch"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/activity_embedding_interactive_divider_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/activity_embedding_interactive_divider_flag_flag_values.textproto
deleted file mode 100644
index 44463423..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/activity_embedding_interactive_divider_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "activity_embedding_interactive_divider_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/activity_embedding_overlay_presentation_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/activity_embedding_overlay_presentation_flag_flag_values.textproto
deleted file mode 100644
index 0177c233..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/activity_embedding_overlay_presentation_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "activity_embedding_overlay_presentation_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/activity_snapshot_by_default_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/activity_snapshot_by_default_flag_values.textproto
deleted file mode 100644
index a6801519..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/activity_snapshot_by_default_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "activity_snapshot_by_default"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/activity_window_info_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/activity_window_info_flag_flag_values.textproto
deleted file mode 100644
index edda5051..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/activity_window_info_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "activity_window_info_flag"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/ae_back_stack_restore_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/ae_back_stack_restore_flag_values.textproto
deleted file mode 100644
index 54c07e44..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/ae_back_stack_restore_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "ae_back_stack_restore"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/allow_disable_activity_record_input_sink_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/allow_disable_activity_record_input_sink_flag_values.textproto
deleted file mode 100644
index 731e9127..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/allow_disable_activity_record_input_sink_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "allow_disable_activity_record_input_sink"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/allow_hide_scm_button_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/allow_hide_scm_button_flag_values.textproto
deleted file mode 100644
index 3f41cfd7..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/allow_hide_scm_button_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "allow_hide_scm_button"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/allow_multiple_adjacent_task_fragments_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/allow_multiple_adjacent_task_fragments_flag_values.textproto
deleted file mode 100644
index 56e0c18c..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/allow_multiple_adjacent_task_fragments_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "allow_multiple_adjacent_task_fragments"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/allows_screen_size_decoupled_from_status_bar_and_cutout_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/allows_screen_size_decoupled_from_status_bar_and_cutout_flag_values.textproto
deleted file mode 100644
index 59017517..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/allows_screen_size_decoupled_from_status_bar_and_cutout_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "allows_screen_size_decoupled_from_status_bar_and_cutout"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/always_capture_activity_snapshot_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/always_capture_activity_snapshot_flag_values.textproto
deleted file mode 100644
index b4b79441..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/always_capture_activity_snapshot_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "always_capture_activity_snapshot"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/always_defer_transition_when_apply_wct_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/always_defer_transition_when_apply_wct_flag_values.textproto
deleted file mode 100644
index 1ca35a80..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/always_defer_transition_when_apply_wct_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "always_defer_transition_when_apply_wct"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/always_draw_magnification_fullscreen_border_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/always_draw_magnification_fullscreen_border_flag_values.textproto
deleted file mode 100644
index a8c99a45..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/always_draw_magnification_fullscreen_border_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "always_draw_magnification_fullscreen_border"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/always_update_wallpaper_permission_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/always_update_wallpaper_permission_flag_values.textproto
deleted file mode 100644
index 11303bd3..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/always_update_wallpaper_permission_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "always_update_wallpaper_permission"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/aod_transition_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/aod_transition_flag_values.textproto
deleted file mode 100644
index 553a01ea..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/aod_transition_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "aod_transition"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/app_compat_async_relayout_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/app_compat_async_relayout_flag_values.textproto
deleted file mode 100644
index 0edfba61..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/app_compat_async_relayout_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "app_compat_async_relayout"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/app_compat_properties_api_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/app_compat_properties_api_flag_values.textproto
deleted file mode 100644
index 10b67f3e..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/app_compat_properties_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "app_compat_properties_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/app_handle_no_relayout_on_exclusion_change_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/app_handle_no_relayout_on_exclusion_change_flag_values.textproto
deleted file mode 100644
index c3ef23cb..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/app_handle_no_relayout_on_exclusion_change_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "app_handle_no_relayout_on_exclusion_change"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/avoid_rebinding_intentionally_disconnected_wallpaper_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/avoid_rebinding_intentionally_disconnected_wallpaper_flag_values.textproto
deleted file mode 100644
index 8ab64028..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/avoid_rebinding_intentionally_disconnected_wallpaper_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "avoid_rebinding_intentionally_disconnected_wallpaper"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/bal_additional_logging_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/bal_additional_logging_flag_values.textproto
deleted file mode 100644
index ce60a2c7..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/bal_additional_logging_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "bal_additional_logging"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/bal_additional_start_modes_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/bal_additional_start_modes_flag_values.textproto
deleted file mode 100644
index c308f37f..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/bal_additional_start_modes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "bal_additional_start_modes"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/bal_clear_allowlist_duration_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/bal_clear_allowlist_duration_flag_values.textproto
deleted file mode 100644
index be56c63d..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/bal_clear_allowlist_duration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "bal_clear_allowlist_duration"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/bal_dont_bring_existing_background_task_stack_to_fg_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/bal_dont_bring_existing_background_task_stack_to_fg_flag_values.textproto
deleted file mode 100644
index 64e8f2cf..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/bal_dont_bring_existing_background_task_stack_to_fg_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "bal_dont_bring_existing_background_task_stack_to_fg"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/bal_improve_real_caller_visibility_check_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/bal_improve_real_caller_visibility_check_flag_values.textproto
deleted file mode 100644
index e6b81d03..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/bal_improve_real_caller_visibility_check_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "bal_improve_real_caller_visibility_check"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/bal_improved_metrics_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/bal_improved_metrics_flag_values.textproto
deleted file mode 100644
index 5a79fc5a..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/bal_improved_metrics_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "bal_improved_metrics"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/bal_reduce_grace_period_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/bal_reduce_grace_period_flag_values.textproto
deleted file mode 100644
index 274690d5..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/bal_reduce_grace_period_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "bal_reduce_grace_period"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/bal_require_opt_in_by_pending_intent_creator_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/bal_require_opt_in_by_pending_intent_creator_flag_values.textproto
deleted file mode 100644
index 73e88e45..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/bal_require_opt_in_by_pending_intent_creator_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "bal_require_opt_in_by_pending_intent_creator"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/bal_respect_app_switch_state_when_check_bound_by_foreground_uid_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/bal_respect_app_switch_state_when_check_bound_by_foreground_uid_flag_values.textproto
deleted file mode 100644
index cb0d2e1d..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/bal_respect_app_switch_state_when_check_bound_by_foreground_uid_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "bal_respect_app_switch_state_when_check_bound_by_foreground_uid"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/bal_send_intent_with_options_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/bal_send_intent_with_options_flag_values.textproto
deleted file mode 100644
index 29b11572..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/bal_send_intent_with_options_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "bal_send_intent_with_options"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/bal_show_toasts_blocked_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/bal_show_toasts_blocked_flag_values.textproto
deleted file mode 100644
index 19faac81..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/bal_show_toasts_blocked_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "bal_show_toasts_blocked"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/bal_strict_mode_grace_period_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/bal_strict_mode_grace_period_flag_values.textproto
deleted file mode 100644
index 7752d053..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/bal_strict_mode_grace_period_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "bal_strict_mode_grace_period"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/bal_strict_mode_ro_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/bal_strict_mode_ro_flag_values.textproto
deleted file mode 100644
index d83d796c..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/bal_strict_mode_ro_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "bal_strict_mode_ro"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/better_support_non_match_parent_activity_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/better_support_non_match_parent_activity_flag_values.textproto
deleted file mode 100644
index 250bc778..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/better_support_non_match_parent_activity_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "better_support_non_match_parent_activity"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/blast_sync_notification_shade_on_display_switch_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/blast_sync_notification_shade_on_display_switch_flag_values.textproto
deleted file mode 100644
index 6cbc8d4c..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/blast_sync_notification_shade_on_display_switch_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "blast_sync_notification_shade_on_display_switch"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/bundle_client_transaction_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/bundle_client_transaction_flag_flag_values.textproto
deleted file mode 100644
index 221b52ff..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/bundle_client_transaction_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "bundle_client_transaction_flag"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/cache_window_style_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/cache_window_style_flag_values.textproto
deleted file mode 100644
index a32ff760..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/cache_window_style_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "cache_window_style"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/camera_compat_for_freeform_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/camera_compat_for_freeform_flag_values.textproto
deleted file mode 100644
index 4bf501a9..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/camera_compat_for_freeform_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "camera_compat_for_freeform"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/camera_compat_fullscreen_pick_same_task_activity_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/camera_compat_fullscreen_pick_same_task_activity_flag_values.textproto
deleted file mode 100644
index e6aebf87..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/camera_compat_fullscreen_pick_same_task_activity_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "camera_compat_fullscreen_pick_same_task_activity"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/check_disabled_snapshots_in_task_persister_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/check_disabled_snapshots_in_task_persister_flag_values.textproto
deleted file mode 100644
index 75a4b5ab..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/check_disabled_snapshots_in_task_persister_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "check_disabled_snapshots_in_task_persister"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/cleanup_dispatch_pending_transactions_remote_exception_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/cleanup_dispatch_pending_transactions_remote_exception_flag_values.textproto
deleted file mode 100644
index a9d1fb25..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/cleanup_dispatch_pending_transactions_remote_exception_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "cleanup_dispatch_pending_transactions_remote_exception"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/clear_system_vibrator_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/clear_system_vibrator_flag_values.textproto
deleted file mode 100644
index 5107db04..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/clear_system_vibrator_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "clear_system_vibrator"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/common_surface_animator_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/common_surface_animator_flag_values.textproto
deleted file mode 100644
index 70e7376e..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/common_surface_animator_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "common_surface_animator"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/condense_configuration_change_for_simple_mode_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/condense_configuration_change_for_simple_mode_flag_values.textproto
deleted file mode 100644
index 27dbeb05..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/condense_configuration_change_for_simple_mode_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "condense_configuration_change_for_simple_mode"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/configurable_font_scale_default_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/configurable_font_scale_default_flag_values.textproto
deleted file mode 100644
index 5ee28b20..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/configurable_font_scale_default_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "configurable_font_scale_default"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/cover_display_opt_in_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/cover_display_opt_in_flag_values.textproto
deleted file mode 100644
index d1a3f7ff..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/cover_display_opt_in_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "cover_display_opt_in"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/defer_display_updates_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/defer_display_updates_flag_values.textproto
deleted file mode 100644
index 38314f28..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/defer_display_updates_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "defer_display_updates"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/defer_predictive_animation_if_no_snapshot_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/defer_predictive_animation_if_no_snapshot_flag_values.textproto
deleted file mode 100644
index a064d8c6..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/defer_predictive_animation_if_no_snapshot_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "defer_predictive_animation_if_no_snapshot"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/delay_notification_to_magnification_when_recents_window_to_front_transition_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/delay_notification_to_magnification_when_recents_window_to_front_transition_flag_values.textproto
deleted file mode 100644
index 00593455..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/delay_notification_to_magnification_when_recents_window_to_front_transition_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "delay_notification_to_magnification_when_recents_window_to_front_transition"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/delegate_back_gesture_to_shell_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/delegate_back_gesture_to_shell_flag_values.textproto
deleted file mode 100644
index 96d70838..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/delegate_back_gesture_to_shell_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "delegate_back_gesture_to_shell"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/delegate_unhandled_drags_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/delegate_unhandled_drags_flag_values.textproto
deleted file mode 100644
index beac1ece..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/delegate_unhandled_drags_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "delegate_unhandled_drags"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/delete_capture_display_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/delete_capture_display_flag_values.textproto
deleted file mode 100644
index 0ba4ddde..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/delete_capture_display_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "delete_capture_display"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/density_390_api_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/density_390_api_flag_values.textproto
deleted file mode 100644
index aaa73998..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/density_390_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "density_390_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/disable_desktop_launch_params_outside_desktop_bug_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/disable_desktop_launch_params_outside_desktop_bug_fix_flag_values.textproto
deleted file mode 100644
index d234eb3b..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/disable_desktop_launch_params_outside_desktop_bug_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "disable_desktop_launch_params_outside_desktop_bug_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/disable_non_resizable_app_snap_resizing_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/disable_non_resizable_app_snap_resizing_flag_values.textproto
deleted file mode 100644
index 8c12ea14..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/disable_non_resizable_app_snap_resizing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "disable_non_resizable_app_snap_resizing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/disable_object_pool_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/disable_object_pool_flag_values.textproto
deleted file mode 100644
index d335d064..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/disable_object_pool_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "disable_object_pool"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/disable_opt_out_edge_to_edge_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/disable_opt_out_edge_to_edge_flag_values.textproto
deleted file mode 100644
index 02c392bb..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/disable_opt_out_edge_to_edge_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "disable_opt_out_edge_to_edge"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/disable_thin_letterboxing_policy_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/disable_thin_letterboxing_policy_flag_values.textproto
deleted file mode 100644
index 6e5fcbd9..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/disable_thin_letterboxing_policy_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "disable_thin_letterboxing_policy"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/disallow_app_progress_embedded_window_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/disallow_app_progress_embedded_window_flag_values.textproto
deleted file mode 100644
index 83a60eb7..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/disallow_app_progress_embedded_window_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "disallow_app_progress_embedded_window"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/do_not_check_intersection_when_non_magnifiable_window_transitions_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/do_not_check_intersection_when_non_magnifiable_window_transitions_flag_values.textproto
deleted file mode 100644
index 7f8f22bd..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/do_not_check_intersection_when_non_magnifiable_window_transitions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "do_not_check_intersection_when_non_magnifiable_window_transitions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/do_not_skip_ime_by_target_visibility_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/do_not_skip_ime_by_target_visibility_flag_values.textproto
deleted file mode 100644
index dbfc7894..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/do_not_skip_ime_by_target_visibility_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "do_not_skip_ime_by_target_visibility"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/draw_snapshot_aspect_ratio_match_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/draw_snapshot_aspect_ratio_match_flag_values.textproto
deleted file mode 100644
index a49224cf..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/draw_snapshot_aspect_ratio_match_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "draw_snapshot_aspect_ratio_match"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/early_launch_hint_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/early_launch_hint_flag_values.textproto
deleted file mode 100644
index 1f6f4dd3..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/early_launch_hint_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "early_launch_hint"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/embedded_activity_back_nav_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/embedded_activity_back_nav_flag_flag_values.textproto
deleted file mode 100644
index 01993cb8..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/embedded_activity_back_nav_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "embedded_activity_back_nav_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_accessible_custom_headers_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_accessible_custom_headers_flag_values.textproto
deleted file mode 100644
index 208b8ca0..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_accessible_custom_headers_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_accessible_custom_headers"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_activity_embedding_support_for_connected_displays_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_activity_embedding_support_for_connected_displays_flag_values.textproto
deleted file mode 100644
index f8b7466c..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_activity_embedding_support_for_connected_displays_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_activity_embedding_support_for_connected_displays"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_app_header_with_task_density_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_app_header_with_task_density_flag_values.textproto
deleted file mode 100644
index 01b64a47..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_app_header_with_task_density_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_app_header_with_task_density"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_buffer_transform_hint_from_display_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_buffer_transform_hint_from_display_flag_values.textproto
deleted file mode 100644
index d214bfd8..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_buffer_transform_hint_from_display_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_buffer_transform_hint_from_display"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_bug_fixes_for_secondary_display_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_bug_fixes_for_secondary_display_flag_values.textproto
deleted file mode 100644
index e6d51d97..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_bug_fixes_for_secondary_display_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_bug_fixes_for_secondary_display"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_camera_compat_for_desktop_windowing_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_camera_compat_for_desktop_windowing_flag_values.textproto
deleted file mode 100644
index 7650d2cf..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_camera_compat_for_desktop_windowing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_camera_compat_for_desktop_windowing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_camera_compat_for_desktop_windowing_opt_out_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_camera_compat_for_desktop_windowing_opt_out_flag_values.textproto
deleted file mode 100644
index 608421f0..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_camera_compat_for_desktop_windowing_opt_out_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_camera_compat_for_desktop_windowing_opt_out"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_caption_compat_inset_force_consumption_always_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_caption_compat_inset_force_consumption_always_flag_values.textproto
deleted file mode 100644
index 25be11e7..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_caption_compat_inset_force_consumption_always_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_caption_compat_inset_force_consumption_always"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_caption_compat_inset_force_consumption_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_caption_compat_inset_force_consumption_flag_values.textproto
deleted file mode 100644
index c396dbfb..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_caption_compat_inset_force_consumption_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_caption_compat_inset_force_consumption"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_cascading_windows_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_cascading_windows_flag_values.textproto
deleted file mode 100644
index 0bf8fe2e..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_cascading_windows_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_cascading_windows"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_compat_ui_visibility_status_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_compat_ui_visibility_status_flag_values.textproto
deleted file mode 100644
index 38547537..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_compat_ui_visibility_status_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_compat_ui_visibility_status"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_connected_displays_dnd_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_connected_displays_dnd_flag_values.textproto
deleted file mode 100644
index efb17788..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_connected_displays_dnd_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_connected_displays_dnd"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_connected_displays_pip_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_connected_displays_pip_flag_values.textproto
deleted file mode 100644
index 88b71061..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_connected_displays_pip_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_connected_displays_pip"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_connected_displays_window_drag_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_connected_displays_window_drag_flag_values.textproto
deleted file mode 100644
index aa054926..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_connected_displays_window_drag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_connected_displays_window_drag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_app_handle_animation_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_app_handle_animation_flag_values.textproto
deleted file mode 100644
index fca25285..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_app_handle_animation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_app_handle_animation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_app_launch_alttab_transitions_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_app_launch_alttab_transitions_bugfix_flag_values.textproto
deleted file mode 100644
index cd817074..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_app_launch_alttab_transitions_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_app_launch_alttab_transitions_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_app_launch_alttab_transitions_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_app_launch_alttab_transitions_flag_values.textproto
deleted file mode 100644
index f30a0604..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_app_launch_alttab_transitions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_app_launch_alttab_transitions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_app_launch_transitions_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_app_launch_transitions_bugfix_flag_values.textproto
deleted file mode 100644
index 4bf630bb..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_app_launch_transitions_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_app_launch_transitions_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_app_launch_transitions_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_app_launch_transitions_flag_values.textproto
deleted file mode 100644
index bd11fa01..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_app_launch_transitions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_app_launch_transitions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_immersive_drag_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_immersive_drag_bugfix_flag_values.textproto
deleted file mode 100644
index 0a0bcb96..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_immersive_drag_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_immersive_drag_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_indicator_in_separate_thread_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_indicator_in_separate_thread_bugfix_flag_values.textproto
deleted file mode 100644
index 17ff787e..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_indicator_in_separate_thread_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_indicator_in_separate_thread_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_mode_through_dev_option_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_mode_through_dev_option_flag_values.textproto
deleted file mode 100644
index 551882f3..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_mode_through_dev_option_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_mode_through_dev_option"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_opening_deeplink_minimize_animation_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_opening_deeplink_minimize_animation_bugfix_flag_values.textproto
deleted file mode 100644
index ee890b0a..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_opening_deeplink_minimize_animation_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_opening_deeplink_minimize_animation_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_recents_transitions_corners_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_recents_transitions_corners_bugfix_flag_values.textproto
deleted file mode 100644
index 459d9175..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_recents_transitions_corners_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_recents_transitions_corners_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_swipe_back_minimize_animation_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_swipe_back_minimize_animation_bugfix_flag_values.textproto
deleted file mode 100644
index d289563c..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_swipe_back_minimize_animation_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_swipe_back_minimize_animation_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_system_dialogs_transitions_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_system_dialogs_transitions_flag_values.textproto
deleted file mode 100644
index 47e95ff5..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_system_dialogs_transitions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_system_dialogs_transitions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_tab_tearing_minimize_animation_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_tab_tearing_minimize_animation_bugfix_flag_values.textproto
deleted file mode 100644
index 21a07d10..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_tab_tearing_minimize_animation_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_tab_tearing_minimize_animation_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_trampoline_close_animation_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_trampoline_close_animation_bugfix_flag_values.textproto
deleted file mode 100644
index 49576858..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_trampoline_close_animation_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_trampoline_close_animation_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_wallpaper_activity_for_system_user_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_wallpaper_activity_for_system_user_flag_values.textproto
deleted file mode 100644
index e314b56b..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_wallpaper_activity_for_system_user_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_wallpaper_activity_for_system_user"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_app_handle_education_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_app_handle_education_flag_values.textproto
deleted file mode 100644
index 7a1069ad..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_app_handle_education_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_windowing_app_handle_education"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_app_to_web_education_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_app_to_web_education_flag_values.textproto
deleted file mode 100644
index 7d04a719..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_app_to_web_education_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_windowing_app_to_web_education"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_app_to_web_education_integration_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_app_to_web_education_integration_flag_values.textproto
deleted file mode 100644
index fe21d545..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_app_to_web_education_integration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_windowing_app_to_web_education_integration"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_app_to_web_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_app_to_web_flag_values.textproto
deleted file mode 100644
index 69beba8a..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_app_to_web_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_windowing_app_to_web"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_back_navigation_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_back_navigation_flag_values.textproto
deleted file mode 100644
index 404e56fb..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_back_navigation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_windowing_back_navigation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_enter_transition_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_enter_transition_bugfix_flag_values.textproto
deleted file mode 100644
index d94ec8d5..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_enter_transition_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_windowing_enter_transition_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_enter_transitions_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_enter_transitions_flag_values.textproto
deleted file mode 100644
index f2a97d36..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_enter_transitions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_windowing_enter_transitions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_exit_by_minimize_transition_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_exit_by_minimize_transition_bugfix_flag_values.textproto
deleted file mode 100644
index 49618977..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_exit_by_minimize_transition_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_windowing_exit_by_minimize_transition_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_exit_transitions_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_exit_transitions_bugfix_flag_values.textproto
deleted file mode 100644
index 7ac89030..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_exit_transitions_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_windowing_exit_transitions_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_exit_transitions_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_exit_transitions_flag_values.textproto
deleted file mode 100644
index c4bf4b61..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_exit_transitions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_windowing_exit_transitions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_hsum_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_hsum_flag_values.textproto
deleted file mode 100644
index 72e07b80..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_hsum_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_windowing_hsum"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_immersive_handle_hiding_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_immersive_handle_hiding_flag_values.textproto
deleted file mode 100644
index 8307a675..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_immersive_handle_hiding_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_windowing_immersive_handle_hiding"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_modals_policy_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_modals_policy_flag_values.textproto
deleted file mode 100644
index 34dd26b3..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_modals_policy_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_windowing_modals_policy"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_mode_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_mode_flag_values.textproto
deleted file mode 100644
index 606961f8..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_mode_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_windowing_mode"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_multi_instance_features_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_multi_instance_features_flag_values.textproto
deleted file mode 100644
index 600ab4f3..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_multi_instance_features_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_windowing_multi_instance_features"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_persistence_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_persistence_flag_values.textproto
deleted file mode 100644
index 598c2739..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_persistence_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_windowing_persistence"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_pip_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_pip_flag_values.textproto
deleted file mode 100644
index 2f13d138..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_pip_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_windowing_pip"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_quick_switch_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_quick_switch_flag_values.textproto
deleted file mode 100644
index 96212ebc..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_quick_switch_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_windowing_quick_switch"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_scvh_cache_bug_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_scvh_cache_bug_fix_flag_values.textproto
deleted file mode 100644
index b5f23ff3..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_scvh_cache_bug_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_windowing_scvh_cache_bug_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_size_constraints_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_size_constraints_flag_values.textproto
deleted file mode 100644
index cbf3d967..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_size_constraints_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_windowing_size_constraints"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_task_limit_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_task_limit_flag_values.textproto
deleted file mode 100644
index 03ba7bd6..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_task_limit_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_windowing_task_limit"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_taskbar_running_apps_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_taskbar_running_apps_flag_values.textproto
deleted file mode 100644
index 35e526f9..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_taskbar_running_apps_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_windowing_taskbar_running_apps"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_transitions_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_transitions_flag_values.textproto
deleted file mode 100644
index 4581d8ae..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_transitions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_windowing_transitions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_wallpaper_activity_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_wallpaper_activity_flag_values.textproto
deleted file mode 100644
index d364a1e7..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_wallpaper_activity_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_desktop_windowing_wallpaper_activity"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_device_state_auto_rotate_setting_logging_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_device_state_auto_rotate_setting_logging_flag_values.textproto
deleted file mode 100644
index c232b32c..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_device_state_auto_rotate_setting_logging_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_device_state_auto_rotate_setting_logging"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_display_focus_in_shell_transitions_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_display_focus_in_shell_transitions_flag_values.textproto
deleted file mode 100644
index c6b23e72..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_display_focus_in_shell_transitions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_display_focus_in_shell_transitions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_display_windowing_mode_switching_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_display_windowing_mode_switching_flag_values.textproto
deleted file mode 100644
index 34e0cd00..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_display_windowing_mode_switching_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_display_windowing_mode_switching"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_drag_resize_set_up_in_bg_thread_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_drag_resize_set_up_in_bg_thread_flag_values.textproto
deleted file mode 100644
index cf46e79e..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_drag_resize_set_up_in_bg_thread_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_drag_resize_set_up_in_bg_thread"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_drag_to_desktop_incoming_transitions_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_drag_to_desktop_incoming_transitions_bugfix_flag_values.textproto
deleted file mode 100644
index 7970cf3e..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_drag_to_desktop_incoming_transitions_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_drag_to_desktop_incoming_transitions_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_drag_to_maximize_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_drag_to_maximize_flag_values.textproto
deleted file mode 100644
index a232c116..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_drag_to_maximize_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_drag_to_maximize"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_dynamic_radius_computation_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_dynamic_radius_computation_bugfix_flag_values.textproto
deleted file mode 100644
index 2cf7fa28..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_dynamic_radius_computation_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_dynamic_radius_computation_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_full_screen_window_on_removing_split_screen_stage_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_full_screen_window_on_removing_split_screen_stage_bugfix_flag_values.textproto
deleted file mode 100644
index e5bc9a88..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_full_screen_window_on_removing_split_screen_stage_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_full_screen_window_on_removing_split_screen_stage_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_fully_immersive_in_desktop_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_fully_immersive_in_desktop_flag_values.textproto
deleted file mode 100644
index ca63c9b3..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_fully_immersive_in_desktop_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_fully_immersive_in_desktop"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_handle_input_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_handle_input_fix_flag_values.textproto
deleted file mode 100644
index 693c6f72..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_handle_input_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_handle_input_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_hold_to_drag_app_handle_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_hold_to_drag_app_handle_flag_values.textproto
deleted file mode 100644
index d86e9edc..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_hold_to_drag_app_handle_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_hold_to_drag_app_handle"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_input_layer_transition_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_input_layer_transition_fix_flag_values.textproto
deleted file mode 100644
index 1264c9fa..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_input_layer_transition_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_input_layer_transition_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_minimize_button_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_minimize_button_flag_values.textproto
deleted file mode 100644
index d5427534..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_minimize_button_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_minimize_button"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_modals_fullscreen_with_permission_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_modals_fullscreen_with_permission_flag_values.textproto
deleted file mode 100644
index db05a313..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_modals_fullscreen_with_permission_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_modals_fullscreen_with_permission"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_move_to_next_display_shortcut_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_move_to_next_display_shortcut_flag_values.textproto
deleted file mode 100644
index 21ca0618..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_move_to_next_display_shortcut_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_move_to_next_display_shortcut"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_non_default_display_split_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_non_default_display_split_flag_values.textproto
deleted file mode 100644
index a871b844..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_non_default_display_split_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_non_default_display_split"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_opaque_background_for_transparent_windows_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_opaque_background_for_transparent_windows_flag_values.textproto
deleted file mode 100644
index 4cfca9c5..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_opaque_background_for_transparent_windows_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_opaque_background_for_transparent_windows"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_per_display_desktop_wallpaper_activity_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_per_display_desktop_wallpaper_activity_flag_values.textproto
deleted file mode 100644
index c6db4bdb..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_per_display_desktop_wallpaper_activity_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_per_display_desktop_wallpaper_activity"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_per_display_package_context_cache_in_statusbar_notif_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_per_display_package_context_cache_in_statusbar_notif_flag_values.textproto
deleted file mode 100644
index 1cca9948..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_per_display_package_context_cache_in_statusbar_notif_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_per_display_package_context_cache_in_statusbar_notif"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_persisting_display_size_for_connected_displays_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_persisting_display_size_for_connected_displays_flag_values.textproto
deleted file mode 100644
index df7c0516..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_persisting_display_size_for_connected_displays_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_persisting_display_size_for_connected_displays"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_presentation_for_connected_displays_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_presentation_for_connected_displays_flag_values.textproto
deleted file mode 100644
index 44b750ba..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_presentation_for_connected_displays_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_presentation_for_connected_displays"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_projected_display_desktop_mode_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_projected_display_desktop_mode_flag_values.textproto
deleted file mode 100644
index 75ccdd13..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_projected_display_desktop_mode_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_projected_display_desktop_mode"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_quickswitch_desktop_split_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_quickswitch_desktop_split_bugfix_flag_values.textproto
deleted file mode 100644
index 7518f2f1..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_quickswitch_desktop_split_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_quickswitch_desktop_split_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_request_fullscreen_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_request_fullscreen_bugfix_flag_values.textproto
deleted file mode 100644
index d9d7a5a4..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_request_fullscreen_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_request_fullscreen_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_resizing_metrics_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_resizing_metrics_flag_values.textproto
deleted file mode 100644
index 6efa4602..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_resizing_metrics_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_resizing_metrics"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_restore_to_previous_size_from_desktop_immersive_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_restore_to_previous_size_from_desktop_immersive_flag_values.textproto
deleted file mode 100644
index 95596c26..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_restore_to_previous_size_from_desktop_immersive_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_restore_to_previous_size_from_desktop_immersive"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_shell_initial_bounds_regression_bug_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_shell_initial_bounds_regression_bug_fix_flag_values.textproto
deleted file mode 100644
index eccaebe8..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_shell_initial_bounds_regression_bug_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_shell_initial_bounds_regression_bug_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_start_launch_transition_from_taskbar_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_start_launch_transition_from_taskbar_bugfix_flag_values.textproto
deleted file mode 100644
index 1adbec52..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_start_launch_transition_from_taskbar_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_start_launch_transition_from_taskbar_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_task_resizing_keyboard_shortcuts_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_task_resizing_keyboard_shortcuts_flag_values.textproto
deleted file mode 100644
index 445c3da0..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_task_resizing_keyboard_shortcuts_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_task_resizing_keyboard_shortcuts"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_task_stack_observer_in_shell_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_task_stack_observer_in_shell_flag_values.textproto
deleted file mode 100644
index 9ea26efb..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_task_stack_observer_in_shell_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_task_stack_observer_in_shell"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_taskbar_connected_displays_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_taskbar_connected_displays_flag_values.textproto
deleted file mode 100644
index 83aa494e..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_taskbar_connected_displays_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_taskbar_connected_displays"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_taskbar_overflow_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_taskbar_overflow_flag_values.textproto
deleted file mode 100644
index 2ebb3311..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_taskbar_overflow_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_taskbar_overflow"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_taskbar_recents_layout_transition_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_taskbar_recents_layout_transition_flag_values.textproto
deleted file mode 100644
index 2940ba83..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_taskbar_recents_layout_transition_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_taskbar_recents_layout_transition"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_themed_app_headers_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_themed_app_headers_flag_values.textproto
deleted file mode 100644
index 2e4bd6e2..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_themed_app_headers_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_themed_app_headers"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_tile_resizing_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_tile_resizing_flag_values.textproto
deleted file mode 100644
index 0bcbbe2d..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_tile_resizing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_tile_resizing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_top_visible_root_task_per_user_tracking_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_top_visible_root_task_per_user_tracking_flag_values.textproto
deleted file mode 100644
index caec462c..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_top_visible_root_task_per_user_tracking_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_top_visible_root_task_per_user_tracking"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_visual_indicator_in_transition_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_visual_indicator_in_transition_bugfix_flag_values.textproto
deleted file mode 100644
index f50896bd..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_visual_indicator_in_transition_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_visual_indicator_in_transition_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_window_context_resources_update_on_config_change_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_window_context_resources_update_on_config_change_flag_values.textproto
deleted file mode 100644
index 73409846..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_window_context_resources_update_on_config_change_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_window_context_resources_update_on_config_change"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_windowing_dynamic_initial_bounds_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_windowing_dynamic_initial_bounds_flag_values.textproto
deleted file mode 100644
index aa7bc7a1..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_windowing_dynamic_initial_bounds_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_windowing_dynamic_initial_bounds"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_windowing_edge_drag_resize_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_windowing_edge_drag_resize_flag_values.textproto
deleted file mode 100644
index 193e4abe..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_windowing_edge_drag_resize_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_windowing_edge_drag_resize"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_windowing_scaled_resizing_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_windowing_scaled_resizing_flag_values.textproto
deleted file mode 100644
index ebf33d19..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_windowing_scaled_resizing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_windowing_scaled_resizing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_windowing_transition_handlers_observers_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_windowing_transition_handlers_observers_flag_values.textproto
deleted file mode 100644
index 53d9284a..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_windowing_transition_handlers_observers_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_windowing_transition_handlers_observers"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_wm_extensions_for_all_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_wm_extensions_for_all_flag_flag_values.textproto
deleted file mode 100644
index ef54789b..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enable_wm_extensions_for_all_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enable_wm_extensions_for_all_flag"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enforce_edge_to_edge_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enforce_edge_to_edge_flag_values.textproto
deleted file mode 100644
index 04067c17..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enforce_edge_to_edge_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enforce_edge_to_edge"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enforce_shell_thread_model_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enforce_shell_thread_model_flag_values.textproto
deleted file mode 100644
index 1f1be81b..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enforce_shell_thread_model_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enforce_shell_thread_model"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/ensure_wallpaper_in_transitions_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/ensure_wallpaper_in_transitions_flag_values.textproto
deleted file mode 100644
index 6668a098..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/ensure_wallpaper_in_transitions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "ensure_wallpaper_in_transitions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/ensure_wallpaper_in_wear_transitions_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/ensure_wallpaper_in_wear_transitions_flag_values.textproto
deleted file mode 100644
index d1e43a80..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/ensure_wallpaper_in_wear_transitions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "ensure_wallpaper_in_wear_transitions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enter_desktop_by_default_on_freeform_displays_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enter_desktop_by_default_on_freeform_displays_flag_values.textproto
deleted file mode 100644
index 342ea729..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/enter_desktop_by_default_on_freeform_displays_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "enter_desktop_by_default_on_freeform_displays"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/exclude_caption_from_app_bounds_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/exclude_caption_from_app_bounds_flag_values.textproto
deleted file mode 100644
index a95e4267..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/exclude_caption_from_app_bounds_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "exclude_caption_from_app_bounds"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/exclude_drawing_app_theme_snapshot_from_lock_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/exclude_drawing_app_theme_snapshot_from_lock_flag_values.textproto
deleted file mode 100644
index 8c409db4..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/exclude_drawing_app_theme_snapshot_from_lock_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "exclude_drawing_app_theme_snapshot_from_lock"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/explicit_refresh_rate_hints_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/explicit_refresh_rate_hints_flag_values.textproto
deleted file mode 100644
index 4cbbf1dc..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/explicit_refresh_rate_hints_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "explicit_refresh_rate_hints"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/filter_irrelevant_input_device_change_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/filter_irrelevant_input_device_change_flag_values.textproto
deleted file mode 100644
index 0b6058c7..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/filter_irrelevant_input_device_change_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "filter_irrelevant_input_device_change"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/fix_hide_overlay_api_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/fix_hide_overlay_api_flag_values.textproto
deleted file mode 100644
index c2b2bcf6..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/fix_hide_overlay_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "fix_hide_overlay_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/fix_layout_existing_task_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/fix_layout_existing_task_flag_values.textproto
deleted file mode 100644
index 3105f9f5..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/fix_layout_existing_task_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "fix_layout_existing_task"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/fix_no_container_update_without_resize_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/fix_no_container_update_without_resize_flag_values.textproto
deleted file mode 100644
index afdf387e..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/fix_no_container_update_without_resize_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "fix_no_container_update_without_resize"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/fix_pip_restore_to_overlay_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/fix_pip_restore_to_overlay_flag_values.textproto
deleted file mode 100644
index ff9c4fd3..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/fix_pip_restore_to_overlay_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "fix_pip_restore_to_overlay"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/fix_view_root_call_trace_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/fix_view_root_call_trace_flag_values.textproto
deleted file mode 100644
index a05d40a8..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/fix_view_root_call_trace_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "fix_view_root_call_trace"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/fullscreen_dim_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/fullscreen_dim_flag_flag_values.textproto
deleted file mode 100644
index a76cae4a..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/fullscreen_dim_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "fullscreen_dim_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/get_dimmer_on_closing_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/get_dimmer_on_closing_flag_values.textproto
deleted file mode 100644
index 785d67a2..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/get_dimmer_on_closing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "get_dimmer_on_closing"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/ignore_aspect_ratio_restrictions_for_resizeable_freeform_activities_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/ignore_aspect_ratio_restrictions_for_resizeable_freeform_activities_flag_values.textproto
deleted file mode 100644
index 6243ac64..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/ignore_aspect_ratio_restrictions_for_resizeable_freeform_activities_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "ignore_aspect_ratio_restrictions_for_resizeable_freeform_activities"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/ignore_corner_radius_and_shadows_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/ignore_corner_radius_and_shadows_flag_values.textproto
deleted file mode 100644
index 07ac04bb..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/ignore_corner_radius_and_shadows_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "ignore_corner_radius_and_shadows"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/immersive_app_repositioning_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/immersive_app_repositioning_flag_values.textproto
deleted file mode 100644
index ff28f839..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/immersive_app_repositioning_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "immersive_app_repositioning"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/include_top_transparent_fullscreen_task_in_desktop_heuristic_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/include_top_transparent_fullscreen_task_in_desktop_heuristic_flag_values.textproto
deleted file mode 100644
index e931c43a..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/include_top_transparent_fullscreen_task_in_desktop_heuristic_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "include_top_transparent_fullscreen_task_in_desktop_heuristic"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/inherit_task_bounds_for_trampoline_task_launches_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/inherit_task_bounds_for_trampoline_task_launches_flag_values.textproto
deleted file mode 100644
index f62c4536..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/inherit_task_bounds_for_trampoline_task_launches_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "inherit_task_bounds_for_trampoline_task_launches"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/insets_control_changed_item_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/insets_control_changed_item_flag_values.textproto
deleted file mode 100644
index 2dbde3b7..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/insets_control_changed_item_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "insets_control_changed_item"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/insets_control_seq_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/insets_control_seq_flag_values.textproto
deleted file mode 100644
index 565d1669..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/insets_control_seq_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "insets_control_seq"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/insets_decoupled_configuration_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/insets_decoupled_configuration_flag_values.textproto
deleted file mode 100644
index a713b69a..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/insets_decoupled_configuration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "insets_decoupled_configuration"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/introduce_smoother_dimmer_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/introduce_smoother_dimmer_flag_values.textproto
deleted file mode 100644
index 843fbad5..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/introduce_smoother_dimmer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "introduce_smoother_dimmer"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/jank_api_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/jank_api_flag_values.textproto
deleted file mode 100644
index b3278f70..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/jank_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "jank_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/keep_app_window_hide_while_locked_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/keep_app_window_hide_while_locked_flag_values.textproto
deleted file mode 100644
index 16b51cbe..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/keep_app_window_hide_while_locked_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "keep_app_window_hide_while_locked"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/keyboard_shortcuts_to_switch_desks_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/keyboard_shortcuts_to_switch_desks_flag_values.textproto
deleted file mode 100644
index a9de1549..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/keyboard_shortcuts_to_switch_desks_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "keyboard_shortcuts_to_switch_desks"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/keyguard_appear_transition_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/keyguard_appear_transition_flag_values.textproto
deleted file mode 100644
index 1703ca3f..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/keyguard_appear_transition_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "keyguard_appear_transition"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/keyguard_going_away_timeout_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/keyguard_going_away_timeout_flag_values.textproto
deleted file mode 100644
index 81fa93db..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/keyguard_going_away_timeout_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "keyguard_going_away_timeout"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/migrate_predictive_back_transition_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/migrate_predictive_back_transition_flag_values.textproto
deleted file mode 100644
index f1acd326..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/migrate_predictive_back_transition_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "migrate_predictive_back_transition"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/movable_cutout_configuration_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/movable_cutout_configuration_flag_values.textproto
deleted file mode 100644
index a552fbe2..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/movable_cutout_configuration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "movable_cutout_configuration"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/move_animation_options_to_change_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/move_animation_options_to_change_flag_values.textproto
deleted file mode 100644
index d4e48dfb..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/move_animation_options_to_change_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "move_animation_options_to_change"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/multi_crop_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/multi_crop_flag_values.textproto
deleted file mode 100644
index 0459f50b..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/multi_crop_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "multi_crop"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/nav_bar_transparent_by_default_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/nav_bar_transparent_by_default_flag_values.textproto
deleted file mode 100644
index 06e32dd8..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/nav_bar_transparent_by_default_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "nav_bar_transparent_by_default"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/nested_tasks_with_independent_bounds_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/nested_tasks_with_independent_bounds_flag_values.textproto
deleted file mode 100644
index 945f60fe..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/nested_tasks_with_independent_bounds_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "nested_tasks_with_independent_bounds"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/no_consecutive_visibility_events_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/no_consecutive_visibility_events_flag_values.textproto
deleted file mode 100644
index 5fe232bd..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/no_consecutive_visibility_events_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "no_consecutive_visibility_events"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/no_duplicate_surface_destroyed_events_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/no_duplicate_surface_destroyed_events_flag_values.textproto
deleted file mode 100644
index e7fe32c0..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/no_duplicate_surface_destroyed_events_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "no_duplicate_surface_destroyed_events"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/no_visibility_event_on_display_state_change_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/no_visibility_event_on_display_state_change_flag_values.textproto
deleted file mode 100644
index e765b72f..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/no_visibility_event_on_display_state_change_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "no_visibility_event_on_display_state_change"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/normalize_home_intent_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/normalize_home_intent_flag_values.textproto
deleted file mode 100644
index 81d84bc3..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/normalize_home_intent_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "normalize_home_intent"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/offload_color_extraction_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/offload_color_extraction_flag_values.textproto
deleted file mode 100644
index 2616f63b..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/offload_color_extraction_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "offload_color_extraction"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/per_user_display_window_settings_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/per_user_display_window_settings_flag_values.textproto
deleted file mode 100644
index 1d691543..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/per_user_display_window_settings_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "per_user_display_window_settings"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/port_window_size_animation_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/port_window_size_animation_flag_values.textproto
deleted file mode 100644
index 00c36ec7..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/port_window_size_animation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "port_window_size_animation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/predictive_back_default_enable_sdk_36_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/predictive_back_default_enable_sdk_36_flag_values.textproto
deleted file mode 100644
index d3e1743c..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/predictive_back_default_enable_sdk_36_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "predictive_back_default_enable_sdk_36"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/predictive_back_priority_system_navigation_observer_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/predictive_back_priority_system_navigation_observer_flag_values.textproto
deleted file mode 100644
index 3fc54a57..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/predictive_back_priority_system_navigation_observer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "predictive_back_priority_system_navigation_observer"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/predictive_back_swipe_edge_none_api_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/predictive_back_swipe_edge_none_api_flag_values.textproto
deleted file mode 100644
index 36f1431c..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/predictive_back_swipe_edge_none_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "predictive_back_swipe_edge_none_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/predictive_back_system_anims_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/predictive_back_system_anims_flag_values.textproto
deleted file mode 100644
index 04960b42..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/predictive_back_system_anims_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "predictive_back_system_anims"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/predictive_back_system_override_callback_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/predictive_back_system_override_callback_flag_values.textproto
deleted file mode 100644
index 334d0f5a..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/predictive_back_system_override_callback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "predictive_back_system_override_callback"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/predictive_back_three_button_nav_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/predictive_back_three_button_nav_flag_values.textproto
deleted file mode 100644
index 0ca13b82..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/predictive_back_three_button_nav_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "predictive_back_three_button_nav"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/predictive_back_timestamp_api_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/predictive_back_timestamp_api_flag_values.textproto
deleted file mode 100644
index 748a42f0..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/predictive_back_timestamp_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "predictive_back_timestamp_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/process_priority_policy_for_multi_window_mode_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/process_priority_policy_for_multi_window_mode_flag_values.textproto
deleted file mode 100644
index 2aad3ad2..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/process_priority_policy_for_multi_window_mode_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "process_priority_policy_for_multi_window_mode"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/rear_display_disable_force_desktop_system_decorations_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/rear_display_disable_force_desktop_system_decorations_flag_values.textproto
deleted file mode 100644
index fcfe9284..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/rear_display_disable_force_desktop_system_decorations_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "rear_display_disable_force_desktop_system_decorations"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/record_task_snapshots_before_shutdown_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/record_task_snapshots_before_shutdown_flag_values.textproto
deleted file mode 100644
index d23ac43c..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/record_task_snapshots_before_shutdown_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "record_task_snapshots_before_shutdown"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/reduce_changed_exclusion_rects_msgs_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/reduce_changed_exclusion_rects_msgs_flag_values.textproto
deleted file mode 100644
index 570a1b19..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/reduce_changed_exclusion_rects_msgs_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "reduce_changed_exclusion_rects_msgs"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/reduce_keyguard_transitions_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/reduce_keyguard_transitions_flag_values.textproto
deleted file mode 100644
index 9e23726e..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/reduce_keyguard_transitions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "reduce_keyguard_transitions"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/reduce_task_snapshot_memory_usage_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/reduce_task_snapshot_memory_usage_flag_values.textproto
deleted file mode 100644
index 9bf26c2f..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/reduce_task_snapshot_memory_usage_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "reduce_task_snapshot_memory_usage"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/reduce_unnecessary_measure_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/reduce_unnecessary_measure_flag_values.textproto
deleted file mode 100644
index 5138f7a2..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/reduce_unnecessary_measure_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "reduce_unnecessary_measure"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/release_snapshot_aggressively_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/release_snapshot_aggressively_flag_values.textproto
deleted file mode 100644
index c3f9a536..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/release_snapshot_aggressively_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "release_snapshot_aggressively"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/release_user_aspect_ratio_wm_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/release_user_aspect_ratio_wm_flag_values.textproto
deleted file mode 100644
index efefd341..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/release_user_aspect_ratio_wm_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "release_user_aspect_ratio_wm"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/remove_activity_starter_dream_callback_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/remove_activity_starter_dream_callback_flag_values.textproto
deleted file mode 100644
index 7341158b..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/remove_activity_starter_dream_callback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "remove_activity_starter_dream_callback"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/remove_defer_hiding_client_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/remove_defer_hiding_client_flag_values.textproto
deleted file mode 100644
index 7705671b..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/remove_defer_hiding_client_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "remove_defer_hiding_client"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/remove_depart_target_from_motion_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/remove_depart_target_from_motion_flag_values.textproto
deleted file mode 100644
index 82b38038..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/remove_depart_target_from_motion_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "remove_depart_target_from_motion"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/remove_prepare_surface_in_placement_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/remove_prepare_surface_in_placement_flag_values.textproto
deleted file mode 100644
index 1c847d9b..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/remove_prepare_surface_in_placement_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "remove_prepare_surface_in_placement"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/remove_starting_window_wait_for_multi_transitions_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/remove_starting_window_wait_for_multi_transitions_flag_values.textproto
deleted file mode 100644
index 117dcfaa..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/remove_starting_window_wait_for_multi_transitions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "remove_starting_window_wait_for_multi_transitions"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/reparent_window_token_api_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/reparent_window_token_api_flag_values.textproto
deleted file mode 100644
index 1c934349..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/reparent_window_token_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "reparent_window_token_api"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/reset_draw_state_on_client_invisible_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/reset_draw_state_on_client_invisible_flag_values.textproto
deleted file mode 100644
index 9bbf6be7..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/reset_draw_state_on_client_invisible_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "reset_draw_state_on_client_invisible"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/respect_animation_clip_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/respect_animation_clip_flag_values.textproto
deleted file mode 100644
index 6f77a9fb..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/respect_animation_clip_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "respect_animation_clip"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/respect_non_top_visible_fixed_orientation_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/respect_non_top_visible_fixed_orientation_flag_values.textproto
deleted file mode 100644
index 4341cfe6..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/respect_non_top_visible_fixed_orientation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "respect_non_top_visible_fixed_orientation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/respect_orientation_change_for_unresizeable_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/respect_orientation_change_for_unresizeable_flag_values.textproto
deleted file mode 100644
index 90d06ace..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/respect_orientation_change_for_unresizeable_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "respect_orientation_change_for_unresizeable"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/safe_region_letterboxing_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/safe_region_letterboxing_flag_values.textproto
deleted file mode 100644
index 02aad85d..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/safe_region_letterboxing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "safe_region_letterboxing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/safe_release_snapshot_aggressively_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/safe_release_snapshot_aggressively_flag_values.textproto
deleted file mode 100644
index 7ec1ff1e..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/safe_release_snapshot_aggressively_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "safe_release_snapshot_aggressively"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/scheduling_for_notification_shade_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/scheduling_for_notification_shade_flag_values.textproto
deleted file mode 100644
index 9d9738ae..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/scheduling_for_notification_shade_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "scheduling_for_notification_shade"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/scramble_snapshot_file_name_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/scramble_snapshot_file_name_flag_values.textproto
deleted file mode 100644
index 01b05f4e..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/scramble_snapshot_file_name_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "scramble_snapshot_file_name"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/screen_recording_callbacks_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/screen_recording_callbacks_flag_values.textproto
deleted file mode 100644
index 7ec42414..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/screen_recording_callbacks_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "screen_recording_callbacks"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/sdk_desired_present_time_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/sdk_desired_present_time_flag_values.textproto
deleted file mode 100644
index a64959ef..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/sdk_desired_present_time_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "sdk_desired_present_time"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/secure_window_state_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/secure_window_state_flag_values.textproto
deleted file mode 100644
index a486c165..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/secure_window_state_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "secure_window_state"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/show_desktop_experience_dev_option_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/show_desktop_experience_dev_option_flag_values.textproto
deleted file mode 100644
index e893a7fd..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/show_desktop_experience_dev_option_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "show_desktop_experience_dev_option"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/show_desktop_windowing_dev_option_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/show_desktop_windowing_dev_option_flag_values.textproto
deleted file mode 100644
index cd548d1b..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/show_desktop_windowing_dev_option_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "show_desktop_windowing_dev_option"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/skip_compat_ui_education_in_desktop_mode_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/skip_compat_ui_education_in_desktop_mode_flag_values.textproto
deleted file mode 100644
index 225df0a2..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/skip_compat_ui_education_in_desktop_mode_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "skip_compat_ui_education_in_desktop_mode"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/skip_decor_view_relayout_when_closing_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/skip_decor_view_relayout_when_closing_bugfix_flag_values.textproto
deleted file mode 100644
index fcad0f2e..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/skip_decor_view_relayout_when_closing_bugfix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "skip_decor_view_relayout_when_closing_bugfix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/skip_sleeping_when_switching_display_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/skip_sleeping_when_switching_display_flag_values.textproto
deleted file mode 100644
index 27654d88..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/skip_sleeping_when_switching_display_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "skip_sleeping_when_switching_display"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/support_widget_intents_on_connected_display_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/support_widget_intents_on_connected_display_flag_values.textproto
deleted file mode 100644
index 39a76631..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/support_widget_intents_on_connected_display_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "support_widget_intents_on_connected_display"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/supports_drag_assistant_to_multiwindow_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/supports_drag_assistant_to_multiwindow_flag_values.textproto
deleted file mode 100644
index 97bcd8e9..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/supports_drag_assistant_to_multiwindow_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "supports_drag_assistant_to_multiwindow"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/supports_multi_instance_system_ui_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/supports_multi_instance_system_ui_flag_values.textproto
deleted file mode 100644
index ee4588a2..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/supports_multi_instance_system_ui_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "supports_multi_instance_system_ui"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/surface_control_input_receiver_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/surface_control_input_receiver_flag_values.textproto
deleted file mode 100644
index 03b2206f..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/surface_control_input_receiver_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "surface_control_input_receiver"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/surface_trusted_overlay_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/surface_trusted_overlay_flag_values.textproto
deleted file mode 100644
index dff34783..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/surface_trusted_overlay_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "surface_trusted_overlay"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/sync_screen_capture_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/sync_screen_capture_flag_values.textproto
deleted file mode 100644
index 8df667e9..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/sync_screen_capture_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "sync_screen_capture"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/system_ui_immersive_confirmation_dialog_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/system_ui_immersive_confirmation_dialog_flag_values.textproto
deleted file mode 100644
index 17a43a3e..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/system_ui_immersive_confirmation_dialog_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "system_ui_immersive_confirmation_dialog"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/system_ui_post_animation_end_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/system_ui_post_animation_end_flag_values.textproto
deleted file mode 100644
index e8679a9a..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/system_ui_post_animation_end_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "system_ui_post_animation_end"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/task_fragment_system_organizer_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/task_fragment_system_organizer_flag_flag_values.textproto
deleted file mode 100644
index cf15a43f..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/task_fragment_system_organizer_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "task_fragment_system_organizer_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/touch_pass_through_opt_in_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/touch_pass_through_opt_in_flag_values.textproto
deleted file mode 100644
index aba1282a..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/touch_pass_through_opt_in_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "touch_pass_through_opt_in"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/transit_tracker_plumbing_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/transit_tracker_plumbing_flag_values.textproto
deleted file mode 100644
index 3cb8ffa5..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/transit_tracker_plumbing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "transit_tracker_plumbing"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/trusted_presentation_listener_for_window_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/trusted_presentation_listener_for_window_flag_values.textproto
deleted file mode 100644
index 8c80d110..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/trusted_presentation_listener_for_window_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "trusted_presentation_listener_for_window"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/unify_back_navigation_transition_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/unify_back_navigation_transition_flag_values.textproto
deleted file mode 100644
index fe654fd2..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/unify_back_navigation_transition_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "unify_back_navigation_transition"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/universal_resizable_by_default_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/universal_resizable_by_default_flag_values.textproto
deleted file mode 100644
index f12de5ac..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/universal_resizable_by_default_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "universal_resizable_by_default"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/untrusted_embedding_any_app_permission_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/untrusted_embedding_any_app_permission_flag_values.textproto
deleted file mode 100644
index 6e4b5381..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/untrusted_embedding_any_app_permission_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "untrusted_embedding_any_app_permission"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/untrusted_embedding_state_sharing_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/untrusted_embedding_state_sharing_flag_values.textproto
deleted file mode 100644
index 42c55e40..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/untrusted_embedding_state_sharing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "untrusted_embedding_state_sharing"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/update_dims_when_window_shown_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/update_dims_when_window_shown_flag_values.textproto
deleted file mode 100644
index 993440aa..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/update_dims_when_window_shown_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "update_dims_when_window_shown"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/update_host_input_transfer_token_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/update_host_input_transfer_token_flag_values.textproto
deleted file mode 100644
index 4503bb91..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/update_host_input_transfer_token_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "update_host_input_transfer_token"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/use_cached_insets_for_display_switch_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/use_cached_insets_for_display_switch_flag_values.textproto
deleted file mode 100644
index fb82454b..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/use_cached_insets_for_display_switch_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "use_cached_insets_for_display_switch"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/use_rt_frame_callback_for_splash_screen_transfer_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/use_rt_frame_callback_for_splash_screen_transfer_flag_values.textproto
deleted file mode 100644
index 94f2e611..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/use_rt_frame_callback_for_splash_screen_transfer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "use_rt_frame_callback_for_splash_screen_transfer"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/use_self_sync_transaction_for_layer_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/use_self_sync_transaction_for_layer_flag_values.textproto
deleted file mode 100644
index ee523de2..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/use_self_sync_transaction_for_layer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "use_self_sync_transaction_for_layer"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/use_tasks_dim_only_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/use_tasks_dim_only_flag_values.textproto
deleted file mode 100644
index 80074b51..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/use_tasks_dim_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "use_tasks_dim_only"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/use_visible_requested_for_process_tracker_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/use_visible_requested_for_process_tracker_flag_values.textproto
deleted file mode 100644
index e6f0b8b8..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/use_visible_requested_for_process_tracker_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "use_visible_requested_for_process_tracker"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/use_window_original_touchable_region_when_magnification_recompute_bounds_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/use_window_original_touchable_region_when_magnification_recompute_bounds_flag_values.textproto
deleted file mode 100644
index b8808755..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/use_window_original_touchable_region_when_magnification_recompute_bounds_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "use_window_original_touchable_region_when_magnification_recompute_bounds"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/user_min_aspect_ratio_app_default_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/user_min_aspect_ratio_app_default_flag_values.textproto
deleted file mode 100644
index 29b1ca72..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/user_min_aspect_ratio_app_default_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "user_min_aspect_ratio_app_default"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/vdm_force_app_universal_resizable_api_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/vdm_force_app_universal_resizable_api_flag_values.textproto
deleted file mode 100644
index 14e30d01..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/vdm_force_app_universal_resizable_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "vdm_force_app_universal_resizable_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/wait_for_transition_on_display_switch_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/wait_for_transition_on_display_switch_flag_values.textproto
deleted file mode 100644
index cdbd3da8..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/wait_for_transition_on_display_switch_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "wait_for_transition_on_display_switch"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/wallpaper_offset_async_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/wallpaper_offset_async_flag_values.textproto
deleted file mode 100644
index 8736ae35..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/wallpaper_offset_async_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "wallpaper_offset_async"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/window_session_relayout_info_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/window_session_relayout_info_flag_values.textproto
deleted file mode 100644
index 8ab8a120..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/window_session_relayout_info_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "window_session_relayout_info"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/window_token_config_thread_safe_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/window_token_config_thread_safe_flag_values.textproto
deleted file mode 100644
index e5ec4546..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/window_token_config_thread_safe_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "window_token_config_thread_safe"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/wlinfo_oncreate_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/wlinfo_oncreate_flag_values.textproto
deleted file mode 100644
index 61e58e2d..00000000
--- a/aconfig/trunk_staging/com.android.window.flags/wlinfo_oncreate_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "wlinfo_oncreate"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/Android.bp b/aconfig/trunk_staging/com.android.wm.shell/Android.bp
deleted file mode 100644
index f3a10730..00000000
--- a/aconfig/trunk_staging/com.android.wm.shell/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.android.wm.shell-all",
-    package: "com.android.wm.shell",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/TEST_MAPPING b/aconfig/trunk_staging/com.android.wm.shell/TEST_MAPPING
deleted file mode 100644
index 27b2c71b..00000000
--- a/aconfig/trunk_staging/com.android.wm.shell/TEST_MAPPING
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "imports": [
-    {
-      "path": "frameworks/base/packages/SystemUI"
-    },
-    {
-      "path": "frameworks/base/libs/WindowManager/Shell"
-    },
-    {
-      "path": "packages/apps/Launcher3"
-    },
-    {
-      "path": "vendor/unbundled_google/packages/NexusLauncher"
-    }
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/bubble_view_info_executors_flag_values.textproto b/aconfig/trunk_staging/com.android.wm.shell/bubble_view_info_executors_flag_values.textproto
deleted file mode 100644
index dddde56f..00000000
--- a/aconfig/trunk_staging/com.android.wm.shell/bubble_view_info_executors_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wm.shell"
-  name: "bubble_view_info_executors"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/enable_app_pairs_flag_values.textproto b/aconfig/trunk_staging/com.android.wm.shell/enable_app_pairs_flag_values.textproto
deleted file mode 100644
index 50228bfb..00000000
--- a/aconfig/trunk_staging/com.android.wm.shell/enable_app_pairs_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wm.shell"
-  name: "enable_app_pairs"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/enable_auto_task_stack_controller_flag_values.textproto b/aconfig/trunk_staging/com.android.wm.shell/enable_auto_task_stack_controller_flag_values.textproto
deleted file mode 100644
index 0dde775c..00000000
--- a/aconfig/trunk_staging/com.android.wm.shell/enable_auto_task_stack_controller_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wm.shell"
-  name: "enable_auto_task_stack_controller"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/enable_bubble_bar_flag_values.textproto b/aconfig/trunk_staging/com.android.wm.shell/enable_bubble_bar_flag_values.textproto
deleted file mode 100644
index bd5c576b..00000000
--- a/aconfig/trunk_staging/com.android.wm.shell/enable_bubble_bar_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wm.shell"
-  name: "enable_bubble_bar"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/enable_bubble_bar_in_persistent_task_bar_flag_values.textproto b/aconfig/trunk_staging/com.android.wm.shell/enable_bubble_bar_in_persistent_task_bar_flag_values.textproto
deleted file mode 100644
index df9108c4..00000000
--- a/aconfig/trunk_staging/com.android.wm.shell/enable_bubble_bar_in_persistent_task_bar_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wm.shell"
-  name: "enable_bubble_bar_in_persistent_task_bar"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/enable_bubble_task_view_listener_flag_values.textproto b/aconfig/trunk_staging/com.android.wm.shell/enable_bubble_task_view_listener_flag_values.textproto
deleted file mode 100644
index 85fbefcc..00000000
--- a/aconfig/trunk_staging/com.android.wm.shell/enable_bubble_task_view_listener_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wm.shell"
-  name: "enable_bubble_task_view_listener"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/enable_bubble_to_fullscreen_flag_values.textproto b/aconfig/trunk_staging/com.android.wm.shell/enable_bubble_to_fullscreen_flag_values.textproto
deleted file mode 100644
index e0620577..00000000
--- a/aconfig/trunk_staging/com.android.wm.shell/enable_bubble_to_fullscreen_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wm.shell"
-  name: "enable_bubble_to_fullscreen"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/enable_create_any_bubble_flag_values.textproto b/aconfig/trunk_staging/com.android.wm.shell/enable_create_any_bubble_flag_values.textproto
deleted file mode 100644
index 9b0c5d81..00000000
--- a/aconfig/trunk_staging/com.android.wm.shell/enable_create_any_bubble_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wm.shell"
-  name: "enable_create_any_bubble"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/enable_dynamic_insets_for_app_launch_flag_values.textproto b/aconfig/trunk_staging/com.android.wm.shell/enable_dynamic_insets_for_app_launch_flag_values.textproto
deleted file mode 100644
index 5c18bc3f..00000000
--- a/aconfig/trunk_staging/com.android.wm.shell/enable_dynamic_insets_for_app_launch_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wm.shell"
-  name: "enable_dynamic_insets_for_app_launch"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/enable_flexible_two_app_split_flag_values.textproto b/aconfig/trunk_staging/com.android.wm.shell/enable_flexible_two_app_split_flag_values.textproto
deleted file mode 100644
index e6bcb89a..00000000
--- a/aconfig/trunk_staging/com.android.wm.shell/enable_flexible_two_app_split_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wm.shell"
-  name: "enable_flexible_two_app_split"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/enable_gsf_flag_values.textproto b/aconfig/trunk_staging/com.android.wm.shell/enable_gsf_flag_values.textproto
deleted file mode 100644
index d59026c2..00000000
--- a/aconfig/trunk_staging/com.android.wm.shell/enable_gsf_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wm.shell"
-  name: "enable_gsf"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/enable_left_right_split_in_portrait_flag_values.textproto b/aconfig/trunk_staging/com.android.wm.shell/enable_left_right_split_in_portrait_flag_values.textproto
deleted file mode 100644
index fd856c1b..00000000
--- a/aconfig/trunk_staging/com.android.wm.shell/enable_left_right_split_in_portrait_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wm.shell"
-  name: "enable_left_right_split_in_portrait"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/enable_pip2_flag_values.textproto b/aconfig/trunk_staging/com.android.wm.shell/enable_pip2_flag_values.textproto
deleted file mode 100644
index e56f6e22..00000000
--- a/aconfig/trunk_staging/com.android.wm.shell/enable_pip2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wm.shell"
-  name: "enable_pip2"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/enable_recents_bookend_transition_flag_values.textproto b/aconfig/trunk_staging/com.android.wm.shell/enable_recents_bookend_transition_flag_values.textproto
deleted file mode 100644
index cf24d6d9..00000000
--- a/aconfig/trunk_staging/com.android.wm.shell/enable_recents_bookend_transition_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wm.shell"
-  name: "enable_recents_bookend_transition"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/enable_split_contextual_flag_values.textproto b/aconfig/trunk_staging/com.android.wm.shell/enable_split_contextual_flag_values.textproto
deleted file mode 100644
index 3eae929d..00000000
--- a/aconfig/trunk_staging/com.android.wm.shell/enable_split_contextual_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wm.shell"
-  name: "enable_split_contextual"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/enable_task_view_controller_cleanup_flag_values.textproto b/aconfig/trunk_staging/com.android.wm.shell/enable_task_view_controller_cleanup_flag_values.textproto
deleted file mode 100644
index a2d0cf4a..00000000
--- a/aconfig/trunk_staging/com.android.wm.shell/enable_task_view_controller_cleanup_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wm.shell"
-  name: "enable_task_view_controller_cleanup"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/enable_taskbar_navbar_unification_flag_values.textproto b/aconfig/trunk_staging/com.android.wm.shell/enable_taskbar_navbar_unification_flag_values.textproto
deleted file mode 100644
index 41740aad..00000000
--- a/aconfig/trunk_staging/com.android.wm.shell/enable_taskbar_navbar_unification_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wm.shell"
-  name: "enable_taskbar_navbar_unification"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/enable_taskbar_on_phones_flag_values.textproto b/aconfig/trunk_staging/com.android.wm.shell/enable_taskbar_on_phones_flag_values.textproto
deleted file mode 100644
index b99a0bc6..00000000
--- a/aconfig/trunk_staging/com.android.wm.shell/enable_taskbar_on_phones_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wm.shell"
-  name: "enable_taskbar_on_phones"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/only_reuse_bubbled_task_when_launched_from_bubble_flag_values.textproto b/aconfig/trunk_staging/com.android.wm.shell/only_reuse_bubbled_task_when_launched_from_bubble_flag_values.textproto
deleted file mode 100644
index fcf1125e..00000000
--- a/aconfig/trunk_staging/com.android.wm.shell/only_reuse_bubbled_task_when_launched_from_bubble_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wm.shell"
-  name: "only_reuse_bubbled_task_when_launched_from_bubble"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/task_view_repository_flag_values.textproto b/aconfig/trunk_staging/com.android.wm.shell/task_view_repository_flag_values.textproto
deleted file mode 100644
index e4e85ab2..00000000
--- a/aconfig/trunk_staging/com.android.wm.shell/task_view_repository_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wm.shell"
-  name: "task_view_repository"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/Android.bp b/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/Android.bp
deleted file mode 100644
index f17c8243..00000000
--- a/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.example.android.aconfig.demo.flags-all",
-    package: "com.example.android.aconfig.demo.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/fifth_flag_flag_values.textproto b/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/fifth_flag_flag_values.textproto
deleted file mode 100644
index c3bf8185..00000000
--- a/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/fifth_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.example.android.aconfig.demo.flags"
-  name: "fifth_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/pc_test_7_flag_values.textproto b/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/pc_test_7_flag_values.textproto
deleted file mode 100644
index 655bd7fe..00000000
--- a/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/pc_test_7_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.example.android.aconfig.demo.flags"
-  name: "pc_test_7"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/yet_another_mendel_gantry_disintegration_bugfix_flag_flag_values.textproto b/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/yet_another_mendel_gantry_disintegration_bugfix_flag_flag_values.textproto
deleted file mode 100644
index 3f66de7d..00000000
--- a/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/yet_another_mendel_gantry_disintegration_bugfix_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.example.android.aconfig.demo.flags"
-  name: "yet_another_mendel_gantry_disintegration_bugfix_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/yet_another_mendel_gantry_disintegration_flag_flag_values.textproto b/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/yet_another_mendel_gantry_disintegration_flag_flag_values.textproto
deleted file mode 100644
index 1bbc63da..00000000
--- a/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/yet_another_mendel_gantry_disintegration_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.example.android.aconfig.demo.flags"
-  name: "yet_another_mendel_gantry_disintegration_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.google.android.iwlan.flags/Android.bp b/aconfig/trunk_staging/com.google.android.iwlan.flags/Android.bp
deleted file mode 100644
index c91588c7..00000000
--- a/aconfig/trunk_staging/com.google.android.iwlan.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.google.android.iwlan.flags-all",
-    package: "com.google.android.iwlan.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.google.android.iwlan.flags/aead_algos_enabled_flag_values.textproto b/aconfig/trunk_staging/com.google.android.iwlan.flags/aead_algos_enabled_flag_values.textproto
deleted file mode 100644
index aa16e194..00000000
--- a/aconfig/trunk_staging/com.google.android.iwlan.flags/aead_algos_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.google.android.iwlan.flags"
-  name: "aead_algos_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.google.android.iwlan.flags/distinct_epdg_selection_for_emergency_sessions_flag_values.textproto b/aconfig/trunk_staging/com.google.android.iwlan.flags/distinct_epdg_selection_for_emergency_sessions_flag_values.textproto
deleted file mode 100644
index ea6da9c5..00000000
--- a/aconfig/trunk_staging/com.google.android.iwlan.flags/distinct_epdg_selection_for_emergency_sessions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.google.android.iwlan.flags"
-  name: "distinct_epdg_selection_for_emergency_sessions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.google.android.iwlan.flags/epdg_selection_exclude_failed_ip_address_flag_values.textproto b/aconfig/trunk_staging/com.google.android.iwlan.flags/epdg_selection_exclude_failed_ip_address_flag_values.textproto
deleted file mode 100644
index 7c51f891..00000000
--- a/aconfig/trunk_staging/com.google.android.iwlan.flags/epdg_selection_exclude_failed_ip_address_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.google.android.iwlan.flags"
-  name: "epdg_selection_exclude_failed_ip_address"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.google.android.iwlan.flags/high_secure_transforms_prioritized_flag_values.textproto b/aconfig/trunk_staging/com.google.android.iwlan.flags/high_secure_transforms_prioritized_flag_values.textproto
deleted file mode 100644
index 286c7947..00000000
--- a/aconfig/trunk_staging/com.google.android.iwlan.flags/high_secure_transforms_prioritized_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.google.android.iwlan.flags"
-  name: "high_secure_transforms_prioritized"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.google.android.iwlan.flags/iwlan_silent_restart_flag_values.textproto b/aconfig/trunk_staging/com.google.android.iwlan.flags/iwlan_silent_restart_flag_values.textproto
deleted file mode 100644
index 5c11eb51..00000000
--- a/aconfig/trunk_staging/com.google.android.iwlan.flags/iwlan_silent_restart_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.google.android.iwlan.flags"
-  name: "iwlan_silent_restart"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.google.android.iwlan.flags/multiple_sa_proposals_flag_values.textproto b/aconfig/trunk_staging/com.google.android.iwlan.flags/multiple_sa_proposals_flag_values.textproto
deleted file mode 100644
index d856b6db..00000000
--- a/aconfig/trunk_staging/com.google.android.iwlan.flags/multiple_sa_proposals_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.google.android.iwlan.flags"
-  name: "multiple_sa_proposals"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.google.android.iwlan.flags/prevent_epdg_selection_threads_exhausted_flag_values.textproto b/aconfig/trunk_staging/com.google.android.iwlan.flags/prevent_epdg_selection_threads_exhausted_flag_values.textproto
deleted file mode 100644
index 62760fb1..00000000
--- a/aconfig/trunk_staging/com.google.android.iwlan.flags/prevent_epdg_selection_threads_exhausted_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.google.android.iwlan.flags"
-  name: "prevent_epdg_selection_threads_exhausted"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.google.android.iwlan.flags/update_n1_mode_on_ui_change_flag_values.textproto b/aconfig/trunk_staging/com.google.android.iwlan.flags/update_n1_mode_on_ui_change_flag_values.textproto
deleted file mode 100644
index 00666182..00000000
--- a/aconfig/trunk_staging/com.google.android.iwlan.flags/update_n1_mode_on_ui_change_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.google.android.iwlan.flags"
-  name: "update_n1_mode_on_ui_change"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.google.android.iwlan.flags/validate_underlying_network_on_no_response_flag_values.textproto b/aconfig/trunk_staging/com.google.android.iwlan.flags/validate_underlying_network_on_no_response_flag_values.textproto
deleted file mode 100644
index 2502af87..00000000
--- a/aconfig/trunk_staging/com.google.android.iwlan.flags/validate_underlying_network_on_no_response_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.google.android.iwlan.flags"
-  name: "validate_underlying_network_on_no_response"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.google.android.platform.launcher.aconfig.flags/Android.bp b/aconfig/trunk_staging/com.google.android.platform.launcher.aconfig.flags/Android.bp
deleted file mode 100644
index 9e453a9c..00000000
--- a/aconfig/trunk_staging/com.google.android.platform.launcher.aconfig.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-  name: "aconfig-values-platform_build_release-trunk_staging-com.google.android.platform.launcher.aconfig.flags-all",
-  package: "com.google.android.platform.launcher.aconfig.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.google.display.pixel.hwc.flags/Android.bp b/aconfig/trunk_staging/com.google.display.pixel.hwc.flags/Android.bp
deleted file mode 100644
index c2b8b734..00000000
--- a/aconfig/trunk_staging/com.google.display.pixel.hwc.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-com.google.display.pixel.hwc.flags-all",
-    package: "com.google.display.pixel.hwc.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/com.google.display.pixel.hwc.flags/enable_dpu_sharpness_flag_values.textproto b/aconfig/trunk_staging/com.google.display.pixel.hwc.flags/enable_dpu_sharpness_flag_values.textproto
deleted file mode 100644
index f763a074..00000000
--- a/aconfig/trunk_staging/com.google.display.pixel.hwc.flags/enable_dpu_sharpness_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.google.display.pixel.hwc.flags"
-  name: "enable_dpu_sharpness"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/libgooglecamerahal.flags/Android.bp b/aconfig/trunk_staging/libgooglecamerahal.flags/Android.bp
deleted file mode 100644
index 37ff328b..00000000
--- a/aconfig/trunk_staging/libgooglecamerahal.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-libgooglecamerahal.flags-all",
-    package: "libgooglecamerahal.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/libgooglecamerahal.flags/batched_request_buffers_flag_values.textproto b/aconfig/trunk_staging/libgooglecamerahal.flags/batched_request_buffers_flag_values.textproto
deleted file mode 100644
index d66ce595..00000000
--- a/aconfig/trunk_staging/libgooglecamerahal.flags/batched_request_buffers_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "libgooglecamerahal.flags"
-  name: "batched_request_buffers"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/libgooglecamerahal.flags/batched_shutter_notifications_flag_values.textproto b/aconfig/trunk_staging/libgooglecamerahal.flags/batched_shutter_notifications_flag_values.textproto
deleted file mode 100644
index c783ee24..00000000
--- a/aconfig/trunk_staging/libgooglecamerahal.flags/batched_shutter_notifications_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "libgooglecamerahal.flags"
-  name: "batched_shutter_notifications"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/libgooglecamerahal.flags/disable_capture_request_timeout_flag_values.textproto b/aconfig/trunk_staging/libgooglecamerahal.flags/disable_capture_request_timeout_flag_values.textproto
deleted file mode 100644
index c8b31743..00000000
--- a/aconfig/trunk_staging/libgooglecamerahal.flags/disable_capture_request_timeout_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "libgooglecamerahal.flags"
-  name: "disable_capture_request_timeout"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/perfetto.flags/Android.bp b/aconfig/trunk_staging/perfetto.flags/Android.bp
deleted file mode 100644
index cffe2fb7..00000000
--- a/aconfig/trunk_staging/perfetto.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-perfetto.flags-all",
-    package: "perfetto.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/perfetto.flags/save_all_traces_in_bugreport_flag_values.textproto b/aconfig/trunk_staging/perfetto.flags/save_all_traces_in_bugreport_flag_values.textproto
deleted file mode 100644
index b7315eb0..00000000
--- a/aconfig/trunk_staging/perfetto.flags/save_all_traces_in_bugreport_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "perfetto.flags"
-  name: "save_all_traces_in_bugreport"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/suspend_service.flags/Android.bp b/aconfig/trunk_staging/suspend_service.flags/Android.bp
deleted file mode 100644
index 201f1190..00000000
--- a/aconfig/trunk_staging/suspend_service.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-suspend_service.flags-all",
-    package: "suspend_service.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/suspend_service.flags/fast_kernel_wakelock_reporting_flag_values.textproto b/aconfig/trunk_staging/suspend_service.flags/fast_kernel_wakelock_reporting_flag_values.textproto
deleted file mode 100644
index b7f5b2cb..00000000
--- a/aconfig/trunk_staging/suspend_service.flags/fast_kernel_wakelock_reporting_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "suspend_service.flags"
-  name: "fast_kernel_wakelock_reporting"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/vendor.vibrator.hal.flags/Android.bp b/aconfig/trunk_staging/vendor.vibrator.hal.flags/Android.bp
deleted file mode 100644
index 60cafbf4..00000000
--- a/aconfig/trunk_staging/vendor.vibrator.hal.flags/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Google Inc. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-aconfig_values {
-    name: "aconfig-values-platform_build_release-trunk_staging-vendor.vibrator.hal.flags-all",
-    package: "vendor.vibrator.hal.flags",
-    srcs: [
-        "*_flag_values.textproto",
-    ],
-}
diff --git a/aconfig/trunk_staging/vendor.vibrator.hal.flags/enable_pwle_v2_flag_values.textproto b/aconfig/trunk_staging/vendor.vibrator.hal.flags/enable_pwle_v2_flag_values.textproto
deleted file mode 100644
index 13b26075..00000000
--- a/aconfig/trunk_staging/vendor.vibrator.hal.flags/enable_pwle_v2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "vendor.vibrator.hal.flags"
-  name: "enable_pwle_v2"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/vendor.vibrator.hal.flags/remove_capo_flag_values.textproto b/aconfig/trunk_staging/vendor.vibrator.hal.flags/remove_capo_flag_values.textproto
deleted file mode 100644
index cae737b0..00000000
--- a/aconfig/trunk_staging/vendor.vibrator.hal.flags/remove_capo_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "vendor.vibrator.hal.flags"
-  name: "remove_capo"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/flag_values/trunk_staging/OWNERS b/flag_values/trunk_staging/OWNERS
deleted file mode 100644
index c5c7a93f..00000000
--- a/flag_values/trunk_staging/OWNERS
+++ /dev/null
@@ -1,10 +0,0 @@
-per-file RELEASE_KERNEL*.textproto=aaronding@google.com # For updating kernel flag values in trunk_staging
-per-file RELEASE_KERNEL*.textproto=achant@google.com # For updating kernel flag values in trunk_staging
-per-file RELEASE_KERNEL*.textproto=cyanhsieh@google.com # For updating kernel flag values in trunk_staging
-per-file RELEASE_KERNEL*.textproto=wangjj@google.com # For updating kernel flag values in trunk_staging
-per-file RELEASE_KERNEL*.textproto=yichunko@google.com # For updating kernel flag values in trunk_staging
-per-file RELEASE_KERNEL*.textproto=zhengpan@google.com # For updating kernel flag values in trunk_staging
-per-file RELEASE_KERNEL_ORIOLE_DIR.textproto=baligh@google.com # b/376076241
-per-file RELEASE_KERNEL_RAVEN_DIR.textproto=baligh@google.com  # b/37607624
-per-file RELEASE_KERNEL_ORIOLE_DIR.textproto=achant@google.com # b/37607624
-per-file RELEASE_KERNEL_RAVEN_DIR.textproto=achant@google.com  # b/37607624
diff --git a/flag_values/trunk_staging/RELEASE_ACONFIG_CHECK_API_LEVEL.textproto b/flag_values/trunk_staging/RELEASE_ACONFIG_CHECK_API_LEVEL.textproto
deleted file mode 100644
index 377e9497..00000000
--- a/flag_values/trunk_staging/RELEASE_ACONFIG_CHECK_API_LEVEL.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_ACONFIG_CHECK_API_LEVEL"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_ACONFIG_NEW_EXPORTED.textproto b/flag_values/trunk_staging/RELEASE_ACONFIG_NEW_EXPORTED.textproto
deleted file mode 100644
index 4b1b5489..00000000
--- a/flag_values/trunk_staging/RELEASE_ACONFIG_NEW_EXPORTED.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_ACONFIG_NEW_EXPORTED"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_APEX_MOUNT_DATA_APEX_EARLY.textproto b/flag_values/trunk_staging/RELEASE_APEX_MOUNT_DATA_APEX_EARLY.textproto
deleted file mode 100644
index e3a70bca..00000000
--- a/flag_values/trunk_staging/RELEASE_APEX_MOUNT_DATA_APEX_EARLY.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_APEX_MOUNT_DATA_APEX_EARLY"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_APEX_USE_EROFS_PREINSTALLED.textproto b/flag_values/trunk_staging/RELEASE_APEX_USE_EROFS_PREINSTALLED.textproto
deleted file mode 100644
index fb1d366e..00000000
--- a/flag_values/trunk_staging/RELEASE_APEX_USE_EROFS_PREINSTALLED.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_APEX_USE_EROFS_PREINSTALLED"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_APKCERTS_INSTALL_ONLY.textproto b/flag_values/trunk_staging/RELEASE_APKCERTS_INSTALL_ONLY.textproto
deleted file mode 100644
index c65d74e1..00000000
--- a/flag_values/trunk_staging/RELEASE_APKCERTS_INSTALL_ONLY.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_APKCERTS_INSTALL_ONLY"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_APPFUNCTION_SIDECAR.textproto b/flag_values/trunk_staging/RELEASE_APPFUNCTION_SIDECAR.textproto
deleted file mode 100644
index e5b76ccb..00000000
--- a/flag_values/trunk_staging/RELEASE_APPFUNCTION_SIDECAR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_APPFUNCTION_SIDECAR"
-value:  {
-  bool_value:  true
-}
\ No newline at end of file
diff --git a/flag_values/trunk_staging/RELEASE_ATTEST_MODULES.textproto b/flag_values/trunk_staging/RELEASE_ATTEST_MODULES.textproto
deleted file mode 100644
index 3e0a5613..00000000
--- a/flag_values/trunk_staging/RELEASE_ATTEST_MODULES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_ATTEST_MODULES"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVATAR_PICKER_APP.textproto b/flag_values/trunk_staging/RELEASE_AVATAR_PICKER_APP.textproto
deleted file mode 100644
index a6c93f4d..00000000
--- a/flag_values/trunk_staging/RELEASE_AVATAR_PICKER_APP.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVATAR_PICKER_APP"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ALLOW_PREINSTALLED_APPS.textproto b/flag_values/trunk_staging/RELEASE_AVF_ALLOW_PREINSTALLED_APPS.textproto
deleted file mode 100644
index c063a168..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ALLOW_PREINSTALLED_APPS.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ALLOW_PREINSTALLED_APPS"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT.textproto
deleted file mode 100644
index 582c6fbb..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_DICE_CHANGES.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_DICE_CHANGES.textproto
deleted file mode 100644
index 03d69f33..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_DICE_CHANGES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_DICE_CHANGES"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_EARLY_VM.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_EARLY_VM.textproto
deleted file mode 100644
index 7f76d598..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_EARLY_VM.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_EARLY_VM"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_LLPVM_CHANGES.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_LLPVM_CHANGES.textproto
deleted file mode 100644
index d4705ded..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_LLPVM_CHANGES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_LLPVM_CHANGES"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_MICROFUCHSIA.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_MICROFUCHSIA.textproto
deleted file mode 100644
index f625296c..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_MICROFUCHSIA.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_MICROFUCHSIA"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM.textproto
deleted file mode 100644
index 2f54f752..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_NETWORK.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_NETWORK.textproto
deleted file mode 100644
index 2594a9fe..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_NETWORK.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_NETWORK"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_REMOTE_ATTESTATION.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_REMOTE_ATTESTATION.textproto
deleted file mode 100644
index b24d9b35..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_REMOTE_ATTESTATION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_REMOTE_ATTESTATION"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_TPU_ASSIGNABLE_DEVICE.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_TPU_ASSIGNABLE_DEVICE.textproto
deleted file mode 100644
index ed85ec5b..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_TPU_ASSIGNABLE_DEVICE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_AVF_ENABLE_TPU_ASSIGNABLE_DEVICE"
-value:  {
-  bool_value:  true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_VENDOR_MODULES.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_VENDOR_MODULES.textproto
deleted file mode 100644
index 15bbdcbd..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_VENDOR_MODULES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_VENDOR_MODULES"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_VIRT_CPUFREQ.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_VIRT_CPUFREQ.textproto
deleted file mode 100644
index e157895e..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_VIRT_CPUFREQ.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_VIRT_CPUFREQ"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_VM_TO_TEE_SERVICES_ALLOWLIST.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_VM_TO_TEE_SERVICES_ALLOWLIST.textproto
deleted file mode 100644
index 180d9263..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_VM_TO_TEE_SERVICES_ALLOWLIST.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_AVF_ENABLE_VM_TO_TEE_SERVICES_ALLOWLIST"
-value:  {
-  bool_value:  true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_WIDEVINE_PVM.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_WIDEVINE_PVM.textproto
deleted file mode 100644
index ffdabf95..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_WIDEVINE_PVM.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_AVF_ENABLE_WIDEVINE_PVM"
-value:  {
-  bool_value:  true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_FIX_VM_FILES_STORAGE_LOCATION_b359439878.textproto b/flag_values/trunk_staging/RELEASE_AVF_FIX_VM_FILES_STORAGE_LOCATION_b359439878.textproto
deleted file mode 100644
index 40e0d136..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_FIX_VM_FILES_STORAGE_LOCATION_b359439878.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_AVF_FIX_VM_FILES_STORAGE_LOCATION_b359439878"
-value:  {
-  bool_value:  true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_IMPROVE_DEBUGGABLE_VMS.textproto b/flag_values/trunk_staging/RELEASE_AVF_IMPROVE_DEBUGGABLE_VMS.textproto
deleted file mode 100644
index 9c3ca6b5..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_IMPROVE_DEBUGGABLE_VMS.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_AVF_IMPROVE_DEBUGGABLE_VMS"
-value:  {
-  bool_value:  true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_MICRODROID_KERNEL_VERSION.textproto b/flag_values/trunk_staging/RELEASE_AVF_MICRODROID_KERNEL_VERSION.textproto
deleted file mode 100644
index b6e3b2c8..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_MICRODROID_KERNEL_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_MICRODROID_KERNEL_VERSION"
-value: {
-  string_value: "android15_66"
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES.textproto b/flag_values/trunk_staging/RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES.textproto
deleted file mode 100644
index 7a25f56c..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_SUPPORT_LONG_RUNNING_VMS.textproto b/flag_values/trunk_staging/RELEASE_AVF_SUPPORT_LONG_RUNNING_VMS.textproto
deleted file mode 100644
index 48050256..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_SUPPORT_LONG_RUNNING_VMS.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_AVF_SUPPORT_LONG_RUNNING_VMS"
-value:  {
-  bool_value:  true
-}
diff --git a/flag_values/trunk_staging/RELEASE_BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI.textproto b/flag_values/trunk_staging/RELEASE_BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI.textproto
deleted file mode 100644
index acf8a88d..00000000
--- a/flag_values/trunk_staging/RELEASE_BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_BLUETOOTH_SOCKET_SERVICE.textproto b/flag_values/trunk_staging/RELEASE_BLUETOOTH_SOCKET_SERVICE.textproto
deleted file mode 100644
index c72f3c18..00000000
--- a/flag_values/trunk_staging/RELEASE_BLUETOOTH_SOCKET_SERVICE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_BLUETOOTH_SOCKET_SERVICE"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_BOARD_API_LEVEL.textproto b/flag_values/trunk_staging/RELEASE_BOARD_API_LEVEL.textproto
deleted file mode 100644
index 839e3f93..00000000
--- a/flag_values/trunk_staging/RELEASE_BOARD_API_LEVEL.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_BOARD_API_LEVEL"
-value: {
-  string_value: "202604"
-}
diff --git a/flag_values/trunk_staging/RELEASE_BPF_ENABLE_LIBBPF.textproto b/flag_values/trunk_staging/RELEASE_BPF_ENABLE_LIBBPF.textproto
deleted file mode 100644
index 4e2b4697..00000000
--- a/flag_values/trunk_staging/RELEASE_BPF_ENABLE_LIBBPF.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_BPF_ENABLE_LIBBPF"
-value:  {
-  bool_value:  true
-}
diff --git a/flag_values/trunk_staging/RELEASE_BUILD_USE_VARIANT_FLAGS.textproto b/flag_values/trunk_staging/RELEASE_BUILD_USE_VARIANT_FLAGS.textproto
deleted file mode 100644
index 6df1a6f4..00000000
--- a/flag_values/trunk_staging/RELEASE_BUILD_USE_VARIANT_FLAGS.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_BUILD_USE_VARIANT_FLAGS"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_CRASHRECOVERY_MODULE.textproto b/flag_values/trunk_staging/RELEASE_CRASHRECOVERY_MODULE.textproto
deleted file mode 100644
index 34354f93..00000000
--- a/flag_values/trunk_staging/RELEASE_CRASHRECOVERY_MODULE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_CRASHRECOVERY_MODULE"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_CREATE_ACONFIG_STORAGE_FILE.textproto b/flag_values/trunk_staging/RELEASE_CREATE_ACONFIG_STORAGE_FILE.textproto
deleted file mode 100644
index f6e24469..00000000
--- a/flag_values/trunk_staging/RELEASE_CREATE_ACONFIG_STORAGE_FILE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_CREATE_ACONFIG_STORAGE_FILE"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_DEFAULT_UPDATABLE_MODULE_VERSION.textproto b/flag_values/trunk_staging/RELEASE_DEFAULT_UPDATABLE_MODULE_VERSION.textproto
deleted file mode 100644
index 86ca4e2a..00000000
--- a/flag_values/trunk_staging/RELEASE_DEFAULT_UPDATABLE_MODULE_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_DEFAULT_UPDATABLE_MODULE_VERSION"
-value:  {
-  string_value:  "361099999"
-}
diff --git a/flag_values/trunk_staging/RELEASE_ENABLE_MAINLINE_ACONFIGD_SOCKET.textproto b/flag_values/trunk_staging/RELEASE_ENABLE_MAINLINE_ACONFIGD_SOCKET.textproto
deleted file mode 100644
index 694494da..00000000
--- a/flag_values/trunk_staging/RELEASE_ENABLE_MAINLINE_ACONFIGD_SOCKET.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_ENABLE_MAINLINE_ACONFIGD_SOCKET"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_ENABLE_TOT_CRONET.textproto b/flag_values/trunk_staging/RELEASE_ENABLE_TOT_CRONET.textproto
deleted file mode 100644
index 4a3b4ee2..00000000
--- a/flag_values/trunk_staging/RELEASE_ENABLE_TOT_CRONET.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_ENABLE_TOT_CRONET"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_ETM_IN_USERDEBUG_ENG.textproto b/flag_values/trunk_staging/RELEASE_ETM_IN_USERDEBUG_ENG.textproto
deleted file mode 100644
index de851fce..00000000
--- a/flag_values/trunk_staging/RELEASE_ETM_IN_USERDEBUG_ENG.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_ETM_IN_USERDEBUG_ENG"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_EXPORTED_FLAG_CHECK.textproto b/flag_values/trunk_staging/RELEASE_EXPORTED_FLAG_CHECK.textproto
deleted file mode 100644
index 4a681d22..00000000
--- a/flag_values/trunk_staging/RELEASE_EXPORTED_FLAG_CHECK.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_EXPORTED_FLAG_CHECK"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_FINGERPRINT_ACONFIG_PACKAGES.textproto b/flag_values/trunk_staging/RELEASE_FINGERPRINT_ACONFIG_PACKAGES.textproto
deleted file mode 100644
index b1788d3c..00000000
--- a/flag_values/trunk_staging/RELEASE_FINGERPRINT_ACONFIG_PACKAGES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_FINGERPRINT_ACONFIG_PACKAGES"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_GOOGLE_AKITA_16K_DEVELOPER_OPTION.textproto b/flag_values/trunk_staging/RELEASE_GOOGLE_AKITA_16K_DEVELOPER_OPTION.textproto
deleted file mode 100644
index 8b97f2d2..00000000
--- a/flag_values/trunk_staging/RELEASE_GOOGLE_AKITA_16K_DEVELOPER_OPTION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_GOOGLE_AKITA_16K_DEVELOPER_OPTION"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_GOOGLE_CAIMAN_16K_DEVELOPER_OPTION.textproto b/flag_values/trunk_staging/RELEASE_GOOGLE_CAIMAN_16K_DEVELOPER_OPTION.textproto
deleted file mode 100644
index 37c6e280..00000000
--- a/flag_values/trunk_staging/RELEASE_GOOGLE_CAIMAN_16K_DEVELOPER_OPTION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_GOOGLE_CAIMAN_16K_DEVELOPER_OPTION"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION.textproto b/flag_values/trunk_staging/RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION.textproto
deleted file mode 100644
index 7a40dccf..00000000
--- a/flag_values/trunk_staging/RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_GOOGLE_KOMODO_16K_DEVELOPER_OPTION.textproto b/flag_values/trunk_staging/RELEASE_GOOGLE_KOMODO_16K_DEVELOPER_OPTION.textproto
deleted file mode 100644
index 4f6be5cb..00000000
--- a/flag_values/trunk_staging/RELEASE_GOOGLE_KOMODO_16K_DEVELOPER_OPTION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_GOOGLE_KOMODO_16K_DEVELOPER_OPTION"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION.textproto b/flag_values/trunk_staging/RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION.textproto
deleted file mode 100644
index 5057404f..00000000
--- a/flag_values/trunk_staging/RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_GOOGLE_TOKAY_16K_DEVELOPER_OPTION.textproto b/flag_values/trunk_staging/RELEASE_GOOGLE_TOKAY_16K_DEVELOPER_OPTION.textproto
deleted file mode 100644
index 94e402e9..00000000
--- a/flag_values/trunk_staging/RELEASE_GOOGLE_TOKAY_16K_DEVELOPER_OPTION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_GOOGLE_TOKAY_16K_DEVELOPER_OPTION"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_HARDWARE_AUDIO_USE_CAP_AIDL.textproto b/flag_values/trunk_staging/RELEASE_HARDWARE_AUDIO_USE_CAP_AIDL.textproto
deleted file mode 100644
index 5ce00a76..00000000
--- a/flag_values/trunk_staging/RELEASE_HARDWARE_AUDIO_USE_CAP_AIDL.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_HARDWARE_AUDIO_USE_CAP_AIDL"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_HC_PHR_FHIR_STRUCTURAL_VALIDATION.textproto b/flag_values/trunk_staging/RELEASE_HC_PHR_FHIR_STRUCTURAL_VALIDATION.textproto
deleted file mode 100644
index e6622a3d..00000000
--- a/flag_values/trunk_staging/RELEASE_HC_PHR_FHIR_STRUCTURAL_VALIDATION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_HC_PHR_FHIR_STRUCTURAL_VALIDATION"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_INSTALL_APEX_SYSTEMSERVER_DEXPREOPT_SAME_PARTITION.textproto b/flag_values/trunk_staging/RELEASE_INSTALL_APEX_SYSTEMSERVER_DEXPREOPT_SAME_PARTITION.textproto
deleted file mode 100644
index f36ea9e0..00000000
--- a/flag_values/trunk_staging/RELEASE_INSTALL_APEX_SYSTEMSERVER_DEXPREOPT_SAME_PARTITION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_INSTALL_APEX_SYSTEMSERVER_DEXPREOPT_SAME_PARTITION"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_AKITA_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_AKITA_DIR.textproto
deleted file mode 100644
index 21527223..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_AKITA_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_AKITA_DIR"
-value: {
-  string_value: "device/google/akita-kernels/6.1/trunk-13211717"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_AKITA_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_AKITA_VERSION.textproto
deleted file mode 100644
index 2543b334..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_AKITA_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_AKITA_VERSION"
-value: {
-  string_value: "6.1"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_BLUEJAY_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_BLUEJAY_DIR.textproto
deleted file mode 100644
index 6bda53de..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_BLUEJAY_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_BLUEJAY_DIR"
-value: {
-  string_value: "device/google/bluejay-kernels/6.1/trunk-13211717"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_BLUEJAY_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_BLUEJAY_VERSION.textproto
deleted file mode 100644
index 963d174e..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_BLUEJAY_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_BLUEJAY_VERSION"
-value: {
-  string_value: "6.1"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_CAIMAN_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_CAIMAN_DIR.textproto
deleted file mode 100644
index 2ed9fb80..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_CAIMAN_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_CAIMAN_DIR"
-value: {
-  string_value: "device/google/caimito-kernels/6.1/trunk-13248619"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_CHEETAH_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_CHEETAH_DIR.textproto
deleted file mode 100644
index 2f0aea24..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_CHEETAH_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_CHEETAH_DIR"
-value: {
-  string_value: "device/google/pantah-kernels/6.1/trunk-13227750"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_CHEETAH_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_CHEETAH_VERSION.textproto
deleted file mode 100644
index d3782a99..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_CHEETAH_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_CHEETAH_VERSION"
-value: {
-  string_value: "6.1"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_COMET_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_COMET_DIR.textproto
deleted file mode 100644
index bd0ed928..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_COMET_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_COMET_DIR"
-value: {
-  string_value: "device/google/comet-kernels/6.1/trunk-13248619"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_FELIX_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_FELIX_DIR.textproto
deleted file mode 100644
index aa4c86f3..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_FELIX_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_FELIX_DIR"
-value: {
-  string_value: "device/google/felix-kernels/6.1/trunk-13211717"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_FELIX_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_FELIX_VERSION.textproto
deleted file mode 100644
index 34b51f48..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_FELIX_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_FELIX_VERSION"
-value: {
-  string_value: "6.1"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_HUSKY_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_HUSKY_DIR.textproto
deleted file mode 100644
index 15dd9a92..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_HUSKY_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_HUSKY_DIR"
-value: {
-  string_value: "device/google/shusky-kernels/6.1/trunk-13211717"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_HUSKY_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_HUSKY_VERSION.textproto
deleted file mode 100644
index d244e572..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_HUSKY_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_HUSKY_VERSION"
-value: {
-  string_value: "6.1"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_KOMODO_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_KOMODO_DIR.textproto
deleted file mode 100644
index 30754937..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_KOMODO_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_KOMODO_DIR"
-value: {
-  string_value: "device/google/caimito-kernels/6.1/trunk-13248619"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_LYNX_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_LYNX_DIR.textproto
deleted file mode 100644
index 1e471dec..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_LYNX_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_LYNX_DIR"
-value: {
-  string_value: "device/google/lynx-kernels/6.1/trunk-13211717"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_LYNX_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_LYNX_VERSION.textproto
deleted file mode 100644
index b306617a..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_LYNX_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_LYNX_VERSION"
-value: {
-  string_value: "6.1"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_ORIOLE_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_ORIOLE_DIR.textproto
deleted file mode 100644
index 1326c4d6..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_ORIOLE_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_ORIOLE_DIR"
-value: {
-  string_value: "device/google/raviole-kernels/6.1/trunk-13211717"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_ORIOLE_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_ORIOLE_VERSION.textproto
deleted file mode 100644
index cf1bb600..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_ORIOLE_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_ORIOLE_VERSION"
-value: {
-  string_value: "6.1"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_PANTHER_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_PANTHER_DIR.textproto
deleted file mode 100644
index 23d057d0..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_PANTHER_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_PANTHER_DIR"
-value: {
-  string_value: "device/google/pantah-kernels/6.1/trunk-13227750"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_PANTHER_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_PANTHER_VERSION.textproto
deleted file mode 100644
index 539e1714..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_PANTHER_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_PANTHER_VERSION"
-value: {
-  string_value: "6.1"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_RAVEN_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_RAVEN_DIR.textproto
deleted file mode 100644
index d93d2360..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_RAVEN_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_RAVEN_DIR"
-value: {
-  string_value: "device/google/raviole-kernels/6.1/trunk-13211717"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_RAVEN_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_RAVEN_VERSION.textproto
deleted file mode 100644
index c4916660..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_RAVEN_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_RAVEN_VERSION"
-value: {
-  string_value: "6.1"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT24_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT24_DIR.textproto
deleted file mode 100644
index 9e5b0695..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT24_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_RIPCURRENT24_DIR"
-value: {
-  string_value: "device/google/caimito-kernels/6.1/trunk-12482486"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENTPRO_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENTPRO_DIR.textproto
deleted file mode 100644
index c9b65d36..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENTPRO_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_RIPCURRENTPRO_DIR"
-value: {
-  string_value: "device/google/caimito-kernels/6.1/trunk-12482486"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_DIR.textproto
deleted file mode 100644
index 1e83515e..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_RIPCURRENT_DIR"
-value: {
-  string_value: "device/google/shusky-kernels/6.1/trunk-13211717"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_VERSION.textproto
deleted file mode 100644
index d717768c..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_RIPCURRENT_VERSION"
-value: {
-  string_value: "6.1"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_DIR.textproto
deleted file mode 100644
index c461818e..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_SHIBA_DIR"
-value: {
-  string_value: "device/google/shusky-kernels/6.1/trunk-13211717"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_VERSION.textproto
deleted file mode 100644
index aeaa0b3b..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_SHIBA_VERSION"
-value: {
-  string_value: "6.1"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_TANGORPRO_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_TANGORPRO_DIR.textproto
deleted file mode 100644
index 0355441d..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_TANGORPRO_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_TANGORPRO_DIR"
-value: {
-  string_value: "device/google/tangorpro-kernels/6.1/trunk-13211717"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_TANGORPRO_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_TANGORPRO_VERSION.textproto
deleted file mode 100644
index 2763aafe..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_TANGORPRO_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_TANGORPRO_VERSION"
-value: {
-  string_value: "6.1"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_TOKAY_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_TOKAY_DIR.textproto
deleted file mode 100644
index c4ffd503..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_TOKAY_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_TOKAY_DIR"
-value: {
-  string_value: "device/google/caimito-kernels/6.1/trunk-13248619"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KOTLIN_LANG_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KOTLIN_LANG_VERSION.textproto
deleted file mode 100644
index 98b9839a..00000000
--- a/flag_values/trunk_staging/RELEASE_KOTLIN_LANG_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KOTLIN_LANG_VERSION"
-value: {
-  string_value: "2"
-}
diff --git a/flag_values/trunk_staging/RELEASE_LARGE_SYSTEM_PROPERTY_NODE.textproto b/flag_values/trunk_staging/RELEASE_LARGE_SYSTEM_PROPERTY_NODE.textproto
deleted file mode 100644
index d31771e1..00000000
--- a/flag_values/trunk_staging/RELEASE_LARGE_SYSTEM_PROPERTY_NODE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_LARGE_SYSTEM_PROPERTY_NODE"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_LIBBINDER_ADDSERVICE_CACHE.textproto b/flag_values/trunk_staging/RELEASE_LIBBINDER_ADDSERVICE_CACHE.textproto
deleted file mode 100644
index 6681b8e2..00000000
--- a/flag_values/trunk_staging/RELEASE_LIBBINDER_ADDSERVICE_CACHE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_LIBBINDER_ADDSERVICE_CACHE"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_LIBBINDER_CLIENT_CACHE.textproto b/flag_values/trunk_staging/RELEASE_LIBBINDER_CLIENT_CACHE.textproto
deleted file mode 100644
index 97e354b6..00000000
--- a/flag_values/trunk_staging/RELEASE_LIBBINDER_CLIENT_CACHE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_LIBBINDER_CLIENT_CACHE"
-value:  {
-  bool_value:  true
-}
diff --git a/flag_values/trunk_staging/RELEASE_LIBBINDER_REMOVE_CACHE_STATIC_LIST.textproto b/flag_values/trunk_staging/RELEASE_LIBBINDER_REMOVE_CACHE_STATIC_LIST.textproto
deleted file mode 100644
index ff759880..00000000
--- a/flag_values/trunk_staging/RELEASE_LIBBINDER_REMOVE_CACHE_STATIC_LIST.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_LIBBINDER_REMOVE_CACHE_STATIC_LIST"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_LIBPOWER_NO_LOCK_BINDER_TXN.textproto b/flag_values/trunk_staging/RELEASE_LIBPOWER_NO_LOCK_BINDER_TXN.textproto
deleted file mode 100644
index ced836ea..00000000
--- a/flag_values/trunk_staging/RELEASE_LIBPOWER_NO_LOCK_BINDER_TXN.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_LIBPOWER_NO_LOCK_BINDER_TXN"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_MEMORY_MANAGEMENT_DAEMON.textproto b/flag_values/trunk_staging/RELEASE_MEMORY_MANAGEMENT_DAEMON.textproto
deleted file mode 100644
index 202d2a23..00000000
--- a/flag_values/trunk_staging/RELEASE_MEMORY_MANAGEMENT_DAEMON.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_MEMORY_MANAGEMENT_DAEMON"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_MOVE_VCN_TO_MAINLINE.textproto b/flag_values/trunk_staging/RELEASE_MOVE_VCN_TO_MAINLINE.textproto
deleted file mode 100644
index 07d80a8b..00000000
--- a/flag_values/trunk_staging/RELEASE_MOVE_VCN_TO_MAINLINE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_MOVE_VCN_TO_MAINLINE"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_NDK_ABI_MONITORED.textproto b/flag_values/trunk_staging/RELEASE_NDK_ABI_MONITORED.textproto
deleted file mode 100644
index fe2dbfa9..00000000
--- a/flag_values/trunk_staging/RELEASE_NDK_ABI_MONITORED.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_NDK_ABI_MONITORED"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_NFC_MAINLINE_MODULE.textproto b/flag_values/trunk_staging/RELEASE_NFC_MAINLINE_MODULE.textproto
deleted file mode 100644
index d2f0c3a7..00000000
--- a/flag_values/trunk_staging/RELEASE_NFC_MAINLINE_MODULE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_NFC_MAINLINE_MODULE"
-value: {
-  bool_value: true
-}
\ No newline at end of file
diff --git a/flag_values/trunk_staging/RELEASE_PACKAGE_EMOJI_FONT_VERSION.textproto b/flag_values/trunk_staging/RELEASE_PACKAGE_EMOJI_FONT_VERSION.textproto
deleted file mode 100644
index 58d80332..00000000
--- a/flag_values/trunk_staging/RELEASE_PACKAGE_EMOJI_FONT_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_EMOJI_FONT_VERSION"
-value: {
-  string_value: "2.047"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PACKAGE_FLAG_EMOJI_FONT_VERSION.textproto b/flag_values/trunk_staging/RELEASE_PACKAGE_FLAG_EMOJI_FONT_VERSION.textproto
deleted file mode 100644
index 40bd0cb2..00000000
--- a/flag_values/trunk_staging/RELEASE_PACKAGE_FLAG_EMOJI_FONT_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_FLAG_EMOJI_FONT_VERSION"
-value: {
-  string_value: "2.047"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PACKAGE_HENTAIGANA_FONT.textproto b/flag_values/trunk_staging/RELEASE_PACKAGE_HENTAIGANA_FONT.textproto
deleted file mode 100644
index 22219363..00000000
--- a/flag_values/trunk_staging/RELEASE_PACKAGE_HENTAIGANA_FONT.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_HENTAIGANA_FONT"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_PACKAGE_LIBSQLITE3.textproto b/flag_values/trunk_staging/RELEASE_PACKAGE_LIBSQLITE3.textproto
deleted file mode 100644
index 5e124ee3..00000000
--- a/flag_values/trunk_staging/RELEASE_PACKAGE_LIBSQLITE3.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_LIBSQLITE3"
-value: {
-  string_value: "3440400"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PACKAGE_MESSAGEQUEUE_IMPLEMENTATION.textproto b/flag_values/trunk_staging/RELEASE_PACKAGE_MESSAGEQUEUE_IMPLEMENTATION.textproto
deleted file mode 100644
index e64f06e3..00000000
--- a/flag_values/trunk_staging/RELEASE_PACKAGE_MESSAGEQUEUE_IMPLEMENTATION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_PACKAGE_MESSAGEQUEUE_IMPLEMENTATION"
-value:  {
-  string_value:  "CombinedMessageQueue/MessageQueue.java"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PACKAGE_NFC_STACK.textproto b/flag_values/trunk_staging/RELEASE_PACKAGE_NFC_STACK.textproto
deleted file mode 100644
index f0b126a9..00000000
--- a/flag_values/trunk_staging/RELEASE_PACKAGE_NFC_STACK.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_NFC_STACK"
-value: {
-  string_value: "com.android.nfcservices"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PACKAGE_NOTO_SANS_KHMER_VERSION.textproto b/flag_values/trunk_staging/RELEASE_PACKAGE_NOTO_SANS_KHMER_VERSION.textproto
deleted file mode 100644
index d212c4c6..00000000
--- a/flag_values/trunk_staging/RELEASE_PACKAGE_NOTO_SANS_KHMER_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_NOTO_SANS_KHMER_VERSION"
-value {
-  string_value: "2.004"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PACKAGE_PROFILING_MODULE.textproto b/flag_values/trunk_staging/RELEASE_PACKAGE_PROFILING_MODULE.textproto
deleted file mode 100644
index fe523590..00000000
--- a/flag_values/trunk_staging/RELEASE_PACKAGE_PROFILING_MODULE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_PROFILING_MODULE"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK.textproto b/flag_values/trunk_staging/RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK.textproto
deleted file mode 100644
index 6bfbf143..00000000
--- a/flag_values/trunk_staging/RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_PACKAGE_VIRTUAL_CAMERA.textproto b/flag_values/trunk_staging/RELEASE_PACKAGE_VIRTUAL_CAMERA.textproto
deleted file mode 100644
index 54fe1061..00000000
--- a/flag_values/trunk_staging/RELEASE_PACKAGE_VIRTUAL_CAMERA.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_VIRTUAL_CAMERA"
-value: {
-  string_value: "virtual_camera"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PACKAGE_WEBVIEW_VERSION.textproto b/flag_values/trunk_staging/RELEASE_PACKAGE_WEBVIEW_VERSION.textproto
deleted file mode 100644
index 698a5277..00000000
--- a/flag_values/trunk_staging/RELEASE_PACKAGE_WEBVIEW_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_WEBVIEW_VERSION"
-value {
-  string_value: "133.0.6943.137"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PLATFORM_SDK_EXTENSION_VERSION.textproto b/flag_values/trunk_staging/RELEASE_PLATFORM_SDK_EXTENSION_VERSION.textproto
deleted file mode 100644
index a2cfb0b2..00000000
--- a/flag_values/trunk_staging/RELEASE_PLATFORM_SDK_EXTENSION_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_PLATFORM_SDK_EXTENSION_VERSION"
-value:  {
-  string_value:  "17"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PLATFORM_SDK_VERSION.textproto b/flag_values/trunk_staging/RELEASE_PLATFORM_SDK_VERSION.textproto
deleted file mode 100644
index e3fdfa58..00000000
--- a/flag_values/trunk_staging/RELEASE_PLATFORM_SDK_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_PLATFORM_SDK_VERSION"
-value:  {
-  string_value:  "36"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PLATFORM_SDK_VERSION_FULL.textproto b/flag_values/trunk_staging/RELEASE_PLATFORM_SDK_VERSION_FULL.textproto
deleted file mode 100644
index 8728065a..00000000
--- a/flag_values/trunk_staging/RELEASE_PLATFORM_SDK_VERSION_FULL.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_PLATFORM_SDK_VERSION_FULL"
-value:  {
-  string_value:  "36.0"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PLATFORM_SECURITY_PATCH.textproto b/flag_values/trunk_staging/RELEASE_PLATFORM_SECURITY_PATCH.textproto
deleted file mode 100644
index 05aaa6d2..00000000
--- a/flag_values/trunk_staging/RELEASE_PLATFORM_SECURITY_PATCH.textproto
+++ /dev/null
@@ -1,5 +0,0 @@
-name: "RELEASE_PLATFORM_SECURITY_PATCH"
-value: {
-  string_value: "2025-06-05"
-}
-
diff --git a/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_ALL_CODENAMES.textproto b/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_ALL_CODENAMES.textproto
deleted file mode 100644
index 1fd909e8..00000000
--- a/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_ALL_CODENAMES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PLATFORM_VERSION_ALL_CODENAMES"
-value: {
-  string_value: "Baklava"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES.textproto b/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES.textproto
deleted file mode 100644
index 4f6b4bdc..00000000
--- a/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES"
-value: {
-  string_value: "Baklava"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_CODENAME.textproto b/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_CODENAME.textproto
deleted file mode 100644
index 1a2f6c39..00000000
--- a/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_CODENAME.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PLATFORM_VERSION_CODENAME"
-value: {
-  string_value: "Baklava"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_KNOWN_CODENAMES.textproto b/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_KNOWN_CODENAMES.textproto
deleted file mode 100644
index 6d1cd9d4..00000000
--- a/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_KNOWN_CODENAMES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PLATFORM_VERSION_KNOWN_CODENAMES"
-value: {
-  string_value: "Base,Base11,Cupcake,Donut,Eclair,Eclair01,EclairMr1,Froyo,Gingerbread,GingerbreadMr1,Honeycomb,HoneycombMr1,HoneycombMr2,IceCreamSandwich,IceCreamSandwichMr1,JellyBean,JellyBeanMr1,JellyBeanMr2,Kitkat,KitkatWatch,Lollipop,LollipopMr1,M,N,NMr1,O,OMr1,P,Q,R,S,Sv2,Tiramisu,UpsideDownCake,VanillaIceCream,Baklava"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_LAST_STABLE.textproto b/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_LAST_STABLE.textproto
deleted file mode 100644
index 49eae7f0..00000000
--- a/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_LAST_STABLE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_PLATFORM_VERSION_LAST_STABLE"
-value:  {
-  string_value:  "16"
-}
diff --git a/flag_values/trunk_staging/RELEASE_R8_GLOBAL_CHECK_NOT_NULL_FLAGS.textproto b/flag_values/trunk_staging/RELEASE_R8_GLOBAL_CHECK_NOT_NULL_FLAGS.textproto
deleted file mode 100644
index 4cdfc7c6..00000000
--- a/flag_values/trunk_staging/RELEASE_R8_GLOBAL_CHECK_NOT_NULL_FLAGS.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_R8_GLOBAL_CHECK_NOT_NULL_FLAGS"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_R8_ONLY_RUNTIME_VISIBLE_ANNOTATIONS.textproto b/flag_values/trunk_staging/RELEASE_R8_ONLY_RUNTIME_VISIBLE_ANNOTATIONS.textproto
deleted file mode 100644
index e2d7d963..00000000
--- a/flag_values/trunk_staging/RELEASE_R8_ONLY_RUNTIME_VISIBLE_ANNOTATIONS.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_R8_ONLY_RUNTIME_VISIBLE_ANNOTATIONS"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_RANGING_STACK.textproto b/flag_values/trunk_staging/RELEASE_RANGING_STACK.textproto
deleted file mode 100644
index c2cadfa8..00000000
--- a/flag_values/trunk_staging/RELEASE_RANGING_STACK.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_RANGING_STACK"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_READ_FROM_NEW_STORAGE.textproto b/flag_values/trunk_staging/RELEASE_READ_FROM_NEW_STORAGE.textproto
deleted file mode 100644
index 4922414b..00000000
--- a/flag_values/trunk_staging/RELEASE_READ_FROM_NEW_STORAGE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_READ_FROM_NEW_STORAGE"
-value: {
-  bool_value: true
-}
\ No newline at end of file
diff --git a/flag_values/trunk_staging/RELEASE_REMOVE_LEGACY_EMOJI_FONT.textproto b/flag_values/trunk_staging/RELEASE_REMOVE_LEGACY_EMOJI_FONT.textproto
deleted file mode 100644
index 291e5aae..00000000
--- a/flag_values/trunk_staging/RELEASE_REMOVE_LEGACY_EMOJI_FONT.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_REMOVE_LEGACY_EMOJI_FONT"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_SELINUX_DATA_DATA_IGNORE.textproto b/flag_values/trunk_staging/RELEASE_SELINUX_DATA_DATA_IGNORE.textproto
deleted file mode 100644
index 8f9fa825..00000000
--- a/flag_values/trunk_staging/RELEASE_SELINUX_DATA_DATA_IGNORE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_SELINUX_DATA_DATA_IGNORE"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_SERVICE_WIFI_SPEED_PROFILE_ART_COMPILATION.textproto b/flag_values/trunk_staging/RELEASE_SERVICE_WIFI_SPEED_PROFILE_ART_COMPILATION.textproto
deleted file mode 100644
index 78450489..00000000
--- a/flag_values/trunk_staging/RELEASE_SERVICE_WIFI_SPEED_PROFILE_ART_COMPILATION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_SERVICE_WIFI_SPEED_PROFILE_ART_COMPILATION"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_SM_OPEN_DECLARED_PASSTHROUGH_HAL.textproto b/flag_values/trunk_staging/RELEASE_SM_OPEN_DECLARED_PASSTHROUGH_HAL.textproto
deleted file mode 100644
index 99db9278..00000000
--- a/flag_values/trunk_staging/RELEASE_SM_OPEN_DECLARED_PASSTHROUGH_HAL.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_SM_OPEN_DECLARED_PASSTHROUGH_HAL"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_SOONG_ONLY_CUTTLEFISH.textproto b/flag_values/trunk_staging/RELEASE_SOONG_ONLY_CUTTLEFISH.textproto
deleted file mode 100644
index 450722e3..00000000
--- a/flag_values/trunk_staging/RELEASE_SOONG_ONLY_CUTTLEFISH.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_SOONG_ONLY_CUTTLEFISH"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_SUPERVISION_SERVICE.textproto b/flag_values/trunk_staging/RELEASE_SUPERVISION_SERVICE.textproto
deleted file mode 100644
index 66ce2939..00000000
--- a/flag_values/trunk_staging/RELEASE_SUPERVISION_SERVICE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_SUPERVISION_SERVICE"
-value:  {
-  bool_value:  true
-}
diff --git a/flag_values/trunk_staging/RELEASE_SYSTEMUI_USE_SPEED_PROFILE.textproto b/flag_values/trunk_staging/RELEASE_SYSTEMUI_USE_SPEED_PROFILE.textproto
deleted file mode 100644
index a887fc4a..00000000
--- a/flag_values/trunk_staging/RELEASE_SYSTEMUI_USE_SPEED_PROFILE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_SYSTEMUI_USE_SPEED_PROFILE"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_TARGET_JAVA_21.textproto b/flag_values/trunk_staging/RELEASE_TARGET_JAVA_21.textproto
deleted file mode 100644
index 7d336557..00000000
--- a/flag_values/trunk_staging/RELEASE_TARGET_JAVA_21.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_TARGET_JAVA_21"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_UI_SOUNDS_DIR.textproto b/flag_values/trunk_staging/RELEASE_UI_SOUNDS_DIR.textproto
deleted file mode 100644
index 6005e058..00000000
--- a/flag_values/trunk_staging/RELEASE_UI_SOUNDS_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_UI_SOUNDS_DIR"
-value {
-  string_value: "effects2025"
-}
diff --git a/flag_values/trunk_staging/RELEASE_UNLOCKED_STORAGE_API.textproto b/flag_values/trunk_staging/RELEASE_UNLOCKED_STORAGE_API.textproto
deleted file mode 100644
index 9330b11e..00000000
--- a/flag_values/trunk_staging/RELEASE_UNLOCKED_STORAGE_API.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_UNLOCKED_STORAGE_API"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_UPROBESTATS_MODULE.textproto b/flag_values/trunk_staging/RELEASE_UPROBESTATS_MODULE.textproto
deleted file mode 100644
index ce917474..00000000
--- a/flag_values/trunk_staging/RELEASE_UPROBESTATS_MODULE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_UPROBESTATS_MODULE"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_USE_DEX_V41.textproto b/flag_values/trunk_staging/RELEASE_USE_DEX_V41.textproto
deleted file mode 100644
index b7faf52e..00000000
--- a/flag_values/trunk_staging/RELEASE_USE_DEX_V41.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_USE_DEX_V41"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_USE_OPTIMIZED_RESOURCE_SHRINKING_BY_DEFAULT.textproto b/flag_values/trunk_staging/RELEASE_USE_OPTIMIZED_RESOURCE_SHRINKING_BY_DEFAULT.textproto
deleted file mode 100644
index a54e60c3..00000000
--- a/flag_values/trunk_staging/RELEASE_USE_OPTIMIZED_RESOURCE_SHRINKING_BY_DEFAULT.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_USE_OPTIMIZED_RESOURCE_SHRINKING_BY_DEFAULT"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_USE_RESOURCE_PROCESSOR_BY_DEFAULT.textproto b/flag_values/trunk_staging/RELEASE_USE_RESOURCE_PROCESSOR_BY_DEFAULT.textproto
deleted file mode 100644
index 9bcea668..00000000
--- a/flag_values/trunk_staging/RELEASE_USE_RESOURCE_PROCESSOR_BY_DEFAULT.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_USE_RESOURCE_PROCESSOR_BY_DEFAULT"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_USE_SYSTEM_FEATURE_BUILD_FLAGS.textproto b/flag_values/trunk_staging/RELEASE_USE_SYSTEM_FEATURE_BUILD_FLAGS.textproto
deleted file mode 100644
index e1a666f7..00000000
--- a/flag_values/trunk_staging/RELEASE_USE_SYSTEM_FEATURE_BUILD_FLAGS.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_USE_SYSTEM_FEATURE_BUILD_FLAGS"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_USE_TRANSITIVE_JARS_IN_CLASSPATH.textproto b/flag_values/trunk_staging/RELEASE_USE_TRANSITIVE_JARS_IN_CLASSPATH.textproto
deleted file mode 100644
index b210b0a5..00000000
--- a/flag_values/trunk_staging/RELEASE_USE_TRANSITIVE_JARS_IN_CLASSPATH.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_USE_TRANSITIVE_JARS_IN_CLASSPATH"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_WIFI_MAINLINE_SUPPLICANT_BINARY.textproto b/flag_values/trunk_staging/RELEASE_WIFI_MAINLINE_SUPPLICANT_BINARY.textproto
deleted file mode 100644
index 955cafda..00000000
--- a/flag_values/trunk_staging/RELEASE_WIFI_MAINLINE_SUPPLICANT_BINARY.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_WIFI_MAINLINE_SUPPLICANT_BINARY"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_WRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES.textproto b/flag_values/trunk_staging/RELEASE_WRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES.textproto
deleted file mode 100644
index 4f37937d..00000000
--- a/flag_values/trunk_staging/RELEASE_WRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_WRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_ZUMAPRO_TARGET_ARCH_VARIANT_ARMV92.textproto b/flag_values/trunk_staging/RELEASE_ZUMAPRO_TARGET_ARCH_VARIANT_ARMV92.textproto
deleted file mode 100644
index 76f2ccdf..00000000
--- a/flag_values/trunk_staging/RELEASE_ZUMAPRO_TARGET_ARCH_VARIANT_ARMV92.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_ZUMAPRO_TARGET_ARCH_VARIANT_ARMV92"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/TEST_MAPPING b/flag_values/trunk_staging/TEST_MAPPING
deleted file mode 100644
index f7d9a379..00000000
--- a/flag_values/trunk_staging/TEST_MAPPING
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "imports": [
-    {
-       "path": "vendor/unbundled_google/packages/SystemUIGoogle"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/release_configs/trunk_staging.textproto b/release_configs/trunk_staging.textproto
deleted file mode 100644
index 3940f921..00000000
--- a/release_configs/trunk_staging.textproto
+++ /dev/null
@@ -1,3 +0,0 @@
-name: "trunk_staging"
-aconfig_value_sets: "aconfig_value_set-platform_build_release-trunk_staging"
-release_config_type: RELEASE_CONFIG