Merge cherrypicks of ['googleplex-android-review.googlesource.com/32890773', 'googleplex-android-review.googlesource.com/32932581', 'googleplex-android-review.googlesource.com/32951517'] into 25Q2-release.

Change-Id: I92f5388422ffbdc489484d9f499d5407d73654f5

16 files changed, 15 insertions, 21 deletions

diff --git a/aconfig/bp2a/com.android.providers.media.flags/enable_photopicker_search_flag_values.textproto b/aconfig/bp2a/com.android.providers.media.flags/enable_photopicker_search_flag_values.textproto
deleted file mode 100644
index 41fb87e0..00000000
--- a/aconfig/bp2a/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/flag_values/bp2a/RELEASE_KERNEL_AKITA_DIR.textproto b/flag_values/bp2a/RELEASE_KERNEL_AKITA_DIR.textproto
index 10a91c3a..7ef317d5 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/25Q2-13296083"
+  string_value: "device/google/akita-kernels/6.1/25Q2-13324106"
 }
diff --git a/flag_values/bp2a/RELEASE_KERNEL_BLUEJAY_DIR.textproto b/flag_values/bp2a/RELEASE_KERNEL_BLUEJAY_DIR.textproto
index caaeeb63..f5057d61 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/25Q2-13296057"
+  string_value: "device/google/bluejay-kernels/6.1/25Q2-13324085"
 }
diff --git a/flag_values/bp2a/RELEASE_KERNEL_CAIMAN_DIR.textproto b/flag_values/bp2a/RELEASE_KERNEL_CAIMAN_DIR.textproto
index 22b5f3c8..796b17c9 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/25Q2-13295275"
+  string_value: "device/google/caimito-kernels/6.1/25Q2-13324178"
 }
diff --git a/flag_values/bp2a/RELEASE_KERNEL_CHEETAH_DIR.textproto b/flag_values/bp2a/RELEASE_KERNEL_CHEETAH_DIR.textproto
index b27184a6..d0ed952d 100644
--- a/flag_values/bp2a/RELEASE_KERNEL_CHEETAH_DIR.textproto
+++ b/flag_values/bp2a/RELEASE_KERNEL_CHEETAH_DIR.textproto
@@ -1,4 +1,4 @@
 name:  "RELEASE_KERNEL_CHEETAH_DIR"
 value:  {
-  string_value:  "device/google/pantah-kernels/6.1/trunk-13256751"
+  string_value:  "device/google/pantah-kernels/6.1/25Q2-13324073"
 }
diff --git a/flag_values/bp2a/RELEASE_KERNEL_COMET_DIR.textproto b/flag_values/bp2a/RELEASE_KERNEL_COMET_DIR.textproto
index 786c13dd..de1b582b 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/25Q2-13295275"
+  string_value: "device/google/comet-kernels/6.1/25Q2-13324178"
 }
diff --git a/flag_values/bp2a/RELEASE_KERNEL_FELIX_DIR.textproto b/flag_values/bp2a/RELEASE_KERNEL_FELIX_DIR.textproto
index aeacbc10..9d9d9da0 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/25Q2-13296083"
+  string_value: "device/google/felix-kernels/6.1/25Q2-13324106"
 }
diff --git a/flag_values/bp2a/RELEASE_KERNEL_HUSKY_DIR.textproto b/flag_values/bp2a/RELEASE_KERNEL_HUSKY_DIR.textproto
index 36bac901..9328410a 100644
--- a/flag_values/bp2a/RELEASE_KERNEL_HUSKY_DIR.textproto
+++ b/flag_values/bp2a/RELEASE_KERNEL_HUSKY_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_HUSKY_DIR"
 value {
-  string_value: "device/google/shusky-kernels/6.1/trunk-13257089"
+  string_value: "device/google/shusky-kernels/6.1/25Q2-13324115"
 }
diff --git a/flag_values/bp2a/RELEASE_KERNEL_KOMODO_DIR.textproto b/flag_values/bp2a/RELEASE_KERNEL_KOMODO_DIR.textproto
index 8621792b..2c54c1e2 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/25Q2-13295275"
+  string_value: "device/google/caimito-kernels/6.1/25Q2-13324178"
 }
diff --git a/flag_values/bp2a/RELEASE_KERNEL_LYNX_DIR.textproto b/flag_values/bp2a/RELEASE_KERNEL_LYNX_DIR.textproto
index d97e0895..90ed1fb6 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/25Q2-13296083"
+  string_value: "device/google/lynx-kernels/6.1/25Q2-13324106"
 }
diff --git a/flag_values/bp2a/RELEASE_KERNEL_ORIOLE_DIR.textproto b/flag_values/bp2a/RELEASE_KERNEL_ORIOLE_DIR.textproto
index 29c87740..8590ce3d 100644
--- a/flag_values/bp2a/RELEASE_KERNEL_ORIOLE_DIR.textproto
+++ b/flag_values/bp2a/RELEASE_KERNEL_ORIOLE_DIR.textproto
@@ -1,4 +1,4 @@
 name:  "RELEASE_KERNEL_ORIOLE_DIR"
 value:  {
-  string_value:  "device/google/raviole-kernels/6.1/trunk-13256751"
+  string_value:  "device/google/raviole-kernels/6.1/25Q2-13324073"
 }
diff --git a/flag_values/bp2a/RELEASE_KERNEL_PANTHER_DIR.textproto b/flag_values/bp2a/RELEASE_KERNEL_PANTHER_DIR.textproto
index 5c6bc595..2349824d 100644
--- a/flag_values/bp2a/RELEASE_KERNEL_PANTHER_DIR.textproto
+++ b/flag_values/bp2a/RELEASE_KERNEL_PANTHER_DIR.textproto
@@ -1,4 +1,4 @@
 name:  "RELEASE_KERNEL_PANTHER_DIR"
 value:  {
-  string_value:  "device/google/pantah-kernels/6.1/trunk-13256751"
+  string_value:  "device/google/pantah-kernels/6.1/25Q2-13324073"
 }
diff --git a/flag_values/bp2a/RELEASE_KERNEL_RAVEN_DIR.textproto b/flag_values/bp2a/RELEASE_KERNEL_RAVEN_DIR.textproto
index 390da89e..c2e45202 100644
--- a/flag_values/bp2a/RELEASE_KERNEL_RAVEN_DIR.textproto
+++ b/flag_values/bp2a/RELEASE_KERNEL_RAVEN_DIR.textproto
@@ -1,4 +1,4 @@
 name:  "RELEASE_KERNEL_RAVEN_DIR"
 value:  {
-  string_value:  "device/google/raviole-kernels/6.1/trunk-13256751"
+  string_value:  "device/google/raviole-kernels/6.1/25Q2-13324073"
 }
diff --git a/flag_values/bp2a/RELEASE_KERNEL_SHIBA_DIR.textproto b/flag_values/bp2a/RELEASE_KERNEL_SHIBA_DIR.textproto
index 4b4ccfa5..05206e47 100644
--- a/flag_values/bp2a/RELEASE_KERNEL_SHIBA_DIR.textproto
+++ b/flag_values/bp2a/RELEASE_KERNEL_SHIBA_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_SHIBA_DIR"
 value {
-  string_value: "device/google/shusky-kernels/6.1/trunk-13257089"
+  string_value: "device/google/shusky-kernels/6.1/25Q2-13324115"
 }
diff --git a/flag_values/bp2a/RELEASE_KERNEL_TANGORPRO_DIR.textproto b/flag_values/bp2a/RELEASE_KERNEL_TANGORPRO_DIR.textproto
index 001900ac..0cd89ef5 100644
--- a/flag_values/bp2a/RELEASE_KERNEL_TANGORPRO_DIR.textproto
+++ b/flag_values/bp2a/RELEASE_KERNEL_TANGORPRO_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_TANGORPRO_DIR"
 value {
-  string_value: "device/google/tangorpro-kernels/6.1/trunk-13256820"
+  string_value: "device/google/tangorpro-kernels/6.1/25Q2-13324106"
 }
diff --git a/flag_values/bp2a/RELEASE_KERNEL_TOKAY_DIR.textproto b/flag_values/bp2a/RELEASE_KERNEL_TOKAY_DIR.textproto
index c284749e..7e0fed41 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/25Q2-13295275"
+  string_value: "device/google/caimito-kernels/6.1/25Q2-13324178"
 }