Merge cherrypicks of ['googleplex-android-review.googlesource.com/30844354'] into 25Q1-release.

Change-Id: I73c4f380e3a6b9366d1c3bbe8e51b7677bb1f8b5

aconfig/systemui.aconfig

diff --git a/aconfig/systemui.aconfig b/aconfig/systemui.aconfig
index d0edc1f..9a9259c 100644
--- a/aconfig/systemui.aconfig
+++ b/aconfig/systemui.aconfig
@@ -66,7 +66,7 @@
 flag {
     name: "new_customization_picker_ui"
     namespace: "systemui"
-    description: "Enables the BC25 design of the customization picker UI."
+    description: "Enables the new design of the customization picker UI."
     bug: "339081035"
 }