Merge cherrypicks of ['googleplex-android-review.googlesource.com/32749962', 'googleplex-android-review.googlesource.com/32772481', 'googleplex-android-review.googlesource.com/32820148', 'googleplex-android-review.googlesource.com/32820151', 'googleplex-android-review.googlesource.com/32820153', 'googleplex-android-review.googlesource.com/32821019', 'googleplex-android-review.googlesource.com/32821020', 'googleplex-android-review.googlesource.com/32821021'] into 25Q2-release.

Change-Id: Ia2a4da8e0e89a12d30bf41fb849a77c4b0341bdc

10 files changed, 23 insertions, 23 deletions

diff --git a/aconfig/bp2a/com.android.settings.flags/hide_le_audio_toggle_for_le_audio_only_device_flag_values.textproto b/aconfig/bp2a/com.android.settings.flags/hide_le_audio_toggle_for_le_audio_only_device_flag_values.textproto
deleted file mode 100644
index d9a711c5..00000000
--- a/aconfig/bp2a/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_ONLY
-}
diff --git a/aconfig/bp2a/com.android.systemui/app_shortcut_removal_fix_flag_values.textproto b/aconfig/bp2a/com.android.systemui/app_shortcut_removal_fix_flag_values.textproto
new file mode 100644
index 00000000..bacaa681
--- /dev/null
+++ b/aconfig/bp2a/com.android.systemui/app_shortcut_removal_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "app_shortcut_removal_fix"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/flag_values/bp2a/RELEASE_KERNEL_AKITA_DIR.textproto b/flag_values/bp2a/RELEASE_KERNEL_AKITA_DIR.textproto
index b4f55fde..10a91c3a 100644
--- a/flag_values/bp2a/RELEASE_KERNEL_AKITA_DIR.textproto
+++ b/flag_values/bp2a/RELEASE_KERNEL_AKITA_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_AKITA_DIR"
-value {
-  string_value: "device/google/akita-kernels/6.1/trunk-13256820"
+value: {
+  string_value: "device/google/akita-kernels/6.1/25Q2-13296083"
 }
diff --git a/flag_values/bp2a/RELEASE_KERNEL_BLUEJAY_DIR.textproto b/flag_values/bp2a/RELEASE_KERNEL_BLUEJAY_DIR.textproto
index 51027edc..caaeeb63 100644
--- a/flag_values/bp2a/RELEASE_KERNEL_BLUEJAY_DIR.textproto
+++ b/flag_values/bp2a/RELEASE_KERNEL_BLUEJAY_DIR.textproto
@@ -1,4 +1,4 @@
-name:  "RELEASE_KERNEL_BLUEJAY_DIR"
-value:  {
-  string_value:  "device/google/bluejay-kernels/6.1/trunk-13256783"
+name: "RELEASE_KERNEL_BLUEJAY_DIR"
+value: {
+  string_value: "device/google/bluejay-kernels/6.1/25Q2-13296057"
 }
diff --git a/flag_values/bp2a/RELEASE_KERNEL_CAIMAN_DIR.textproto b/flag_values/bp2a/RELEASE_KERNEL_CAIMAN_DIR.textproto
index 780f33b3..22b5f3c8 100644
--- a/flag_values/bp2a/RELEASE_KERNEL_CAIMAN_DIR.textproto
+++ b/flag_values/bp2a/RELEASE_KERNEL_CAIMAN_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_CAIMAN_DIR"
-value {
-  string_value: "device/google/caimito-kernels/6.1/trunk-13256840"
+value: {
+  string_value: "device/google/caimito-kernels/6.1/25Q2-13295275"
 }
diff --git a/flag_values/bp2a/RELEASE_KERNEL_COMET_DIR.textproto b/flag_values/bp2a/RELEASE_KERNEL_COMET_DIR.textproto
index 08cd557d..786c13dd 100644
--- a/flag_values/bp2a/RELEASE_KERNEL_COMET_DIR.textproto
+++ b/flag_values/bp2a/RELEASE_KERNEL_COMET_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_COMET_DIR"
-value {
-  string_value: "device/google/comet-kernels/6.1/trunk-13256840"
+value: {
+  string_value: "device/google/comet-kernels/6.1/25Q2-13295275"
 }
diff --git a/flag_values/bp2a/RELEASE_KERNEL_FELIX_DIR.textproto b/flag_values/bp2a/RELEASE_KERNEL_FELIX_DIR.textproto
index 68ec6421..aeacbc10 100644
--- a/flag_values/bp2a/RELEASE_KERNEL_FELIX_DIR.textproto
+++ b/flag_values/bp2a/RELEASE_KERNEL_FELIX_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_FELIX_DIR"
-value {
-  string_value: "device/google/felix-kernels/6.1/trunk-13256820"
+value: {
+  string_value: "device/google/felix-kernels/6.1/25Q2-13296083"
 }
diff --git a/flag_values/bp2a/RELEASE_KERNEL_KOMODO_DIR.textproto b/flag_values/bp2a/RELEASE_KERNEL_KOMODO_DIR.textproto
index 621713e7..8621792b 100644
--- a/flag_values/bp2a/RELEASE_KERNEL_KOMODO_DIR.textproto
+++ b/flag_values/bp2a/RELEASE_KERNEL_KOMODO_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_KOMODO_DIR"
-value {
-  string_value: "device/google/caimito-kernels/6.1/trunk-13256840"
+value: {
+  string_value: "device/google/caimito-kernels/6.1/25Q2-13295275"
 }
diff --git a/flag_values/bp2a/RELEASE_KERNEL_LYNX_DIR.textproto b/flag_values/bp2a/RELEASE_KERNEL_LYNX_DIR.textproto
index 87e3f530..d97e0895 100644
--- a/flag_values/bp2a/RELEASE_KERNEL_LYNX_DIR.textproto
+++ b/flag_values/bp2a/RELEASE_KERNEL_LYNX_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_LYNX_DIR"
-value {
-  string_value: "device/google/lynx-kernels/6.1/trunk-13256820"
+value: {
+  string_value: "device/google/lynx-kernels/6.1/25Q2-13296083"
 }
diff --git a/flag_values/bp2a/RELEASE_KERNEL_TOKAY_DIR.textproto b/flag_values/bp2a/RELEASE_KERNEL_TOKAY_DIR.textproto
index cf7b6f60..c284749e 100644
--- a/flag_values/bp2a/RELEASE_KERNEL_TOKAY_DIR.textproto
+++ b/flag_values/bp2a/RELEASE_KERNEL_TOKAY_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_TOKAY_DIR"
-value {
-  string_value: "device/google/caimito-kernels/6.1/trunk-13256840"
+value: {
+  string_value: "device/google/caimito-kernels/6.1/25Q2-13295275"
 }