Merge cherrypicks of ['googleplex-android-review.googlesource.com/26048966', 'googleplex-android-review.googlesource.com/26050780'] into 24Q1-release.android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I300aecc302c82051a69b33c45278691d3c6de54a

10 files changed, 24 insertions, 36 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 608938e..818383a 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,8 +1,8 @@
 drops {
   android_build_drop {
-    build_id: "10917791"
-    target: "mainline_modules_sdks-trunk-userdebug"
-    source_file: "mainline-sdks/for-latest-build/current/com.google.android.media/sdk/media-module-sdk-current.zip"
+    build_id: "T1009193"
+    target: "train_build"
+    source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.media/sdk/media-module-sdk-current.zip"
   }
   dest_file: "current/current.zip"
   version: ""
diff --git a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
index 8f6a513..16bfee8 100644
--- a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
@@ -1,8 +1,8 @@
 drops {
   android_build_drop {
-    build_id: "10917791"
-    target: "mainline_go_modules_sdks-trunk-userdebug"
-    source_file: "mainline-sdks/for-latest-build/current/com.google.android.go.media/sdk/media-module-sdk-current.zip"
+    build_id: "T1009193"
+    target: "train_build"
+    source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.go.media/sdk/media-module-sdk-current.zip"
   }
   dest_file: "go/current/current.zip"
   version: ""
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index 4c5d4c2..b47961a 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -65,8 +65,8 @@ Landroid/media/MediaCommunicationManager$SessionCallbackRecord;->hashCode()I,cor
 Landroid/media/MediaCommunicationManager;->getSession2Tokens()Ljava/util/List;,public-api,sdk,system-api,test-api
 Landroid/media/MediaCommunicationManager;->getVersion()I,public-api,sdk,system-api,test-api
 Landroid/media/MediaController2$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/media/MediaController2$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/media/MediaController2$$ExternalSyntheticLambda2;->binderDied()V,public-api,sdk,system-api,test-api
+Landroid/media/MediaController2$$ExternalSyntheticLambda1;->binderDied()V,public-api,sdk,system-api,test-api
+Landroid/media/MediaController2$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/MediaController2$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/MediaController2$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/MediaController2$2$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
@@ -233,8 +233,8 @@ Landroid/media/MediaSession2Service;->onGetSession(Landroid/media/MediaSession2$
 Landroid/media/MediaSession2Service;->onUpdateNotification(Landroid/media/MediaSession2;)Landroid/media/MediaSession2Service$MediaNotification;,public-api,sdk,system-api,test-api
 Landroid/media/MediaSession2Service;->removeSession(Landroid/media/MediaSession2;)V,public-api,sdk,system-api,test-api
 Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda2;->binderDied()V,public-api,sdk,system-api,test-api
+Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda1;->binderDied()V,public-api,sdk,system-api,test-api
+Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/MediaTranscodingManager$OnTranscodingFinishedListener;->onTranscodingFinished(Landroid/media/MediaTranscodingManager$TranscodingSession;)V,sdk,system-api,test-api
@@ -724,7 +724,6 @@ Landroid/media/internal/guava_common/collect/ImmutableCollection;->addAll(Ljava/
 Landroid/media/internal/guava_common/collect/ImmutableCollection;->clear()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableCollection;->contains(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableCollection;->iterator()Ljava/util/Iterator;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/media/internal/guava_common/collect/ImmutableCollection;->readObject(Ljava/io/ObjectInputStream;)V,sdk
 Landroid/media/internal/guava_common/collect/ImmutableCollection;->remove(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableCollection;->removeAll(Ljava/util/Collection;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableCollection;->retainAll(Ljava/util/Collection;)Z,core-platform-api,public-api,sdk,system-api,test-api
@@ -775,7 +774,6 @@ Landroid/media/internal/guava_common/collect/ImmutableMap;->isEmpty()Z,core-plat
 Landroid/media/internal/guava_common/collect/ImmutableMap;->keySet()Ljava/util/Set;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableMap;->putAll(Ljava/util/Map;)V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/media/internal/guava_common/collect/ImmutableMap;->readObject(Ljava/io/ObjectInputStream;)V,sdk
 Landroid/media/internal/guava_common/collect/ImmutableMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableMap;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableMap;->values()Ljava/util/Collection;,core-platform-api,public-api,sdk,system-api,test-api
@@ -784,7 +782,6 @@ Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet$EntrySetSerial
 Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet$EntrySetSerializedForm;->serialVersionUID:J,sdk
 Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet;->contains(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet;->readObject(Ljava/io/ObjectInputStream;)V,sdk
 Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet;->size()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet;->writeReplace()Ljava/lang/Object;,sdk
 Landroid/media/internal/guava_common/collect/ImmutableSet$SerializedForm;->readResolve()Ljava/lang/Object;,sdk
@@ -792,7 +789,6 @@ Landroid/media/internal/guava_common/collect/ImmutableSet$SerializedForm;->seria
 Landroid/media/internal/guava_common/collect/ImmutableSet;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableSet;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableSet;->iterator()Ljava/util/Iterator;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/media/internal/guava_common/collect/ImmutableSet;->readObject(Ljava/io/ObjectInputStream;)V,sdk
 Landroid/media/internal/guava_common/collect/ImmutableSet;->writeReplace()Ljava/lang/Object;,sdk
 Landroid/media/internal/guava_common/collect/ImmutableSortedMap$1EntrySet$1;->get(I)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableSortedMap$1EntrySet$1;->size()I,core-platform-api,public-api,sdk,system-api,test-api
@@ -821,7 +817,6 @@ Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->lowerKey(Ljava
 Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->navigableKeySet()Ljava/util/NavigableSet;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->pollFirstEntry()Ljava/util/Map$Entry;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->pollLastEntry()Ljava/util/Map$Entry;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->readObject(Ljava/io/ObjectInputStream;)V,sdk
 Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->serialVersionUID:J,sdk
 Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->size()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->subMap(Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/SortedMap;,core-platform-api,public-api,sdk,system-api,test-api
@@ -922,7 +917,6 @@ Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->keySet()Ljava
 Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->putAll(Ljava/util/Map;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->putIfAbsent(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->readObject(Ljava/io/ObjectInputStream;)V,sdk
 Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->remove(Ljava/lang/Object;Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->replace(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index 84d733b..683a1d9 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -65,8 +65,8 @@ Landroid/media/MediaCommunicationManager$SessionCallbackRecord;->hashCode()I,cor
 Landroid/media/MediaCommunicationManager;->getSession2Tokens()Ljava/util/List;,public-api,system-api,test-api
 Landroid/media/MediaCommunicationManager;->getVersion()I,public-api,system-api,test-api
 Landroid/media/MediaController2$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/media/MediaController2$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/media/MediaController2$$ExternalSyntheticLambda2;->binderDied()V,public-api,system-api,test-api
+Landroid/media/MediaController2$$ExternalSyntheticLambda1;->binderDied()V,public-api,system-api,test-api
+Landroid/media/MediaController2$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/media/MediaController2$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/media/MediaController2$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/media/MediaController2$2$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
@@ -232,8 +232,8 @@ Landroid/media/MediaSession2Service;->onGetSession(Landroid/media/MediaSession2$
 Landroid/media/MediaSession2Service;->onUpdateNotification(Landroid/media/MediaSession2;)Landroid/media/MediaSession2Service$MediaNotification;,public-api,system-api,test-api
 Landroid/media/MediaSession2Service;->removeSession(Landroid/media/MediaSession2;)V,public-api,system-api,test-api
 Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda2;->binderDied()V,public-api,system-api,test-api
+Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda1;->binderDied()V,public-api,system-api,test-api
+Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/media/MediaTranscodingManager$OnTranscodingFinishedListener;->onTranscodingFinished(Landroid/media/MediaTranscodingManager$TranscodingSession;)V,system-api,test-api
diff --git a/current/sdk_library/public/framework-media.srcjar b/current/sdk_library/public/framework-media.srcjar
index 2bc0d64..b7b829e 100644
--- a/current/sdk_library/public/framework-media.srcjar
+++ b/current/sdk_library/public/framework-media.srcjar
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index fffc196..ed90a08 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10917791
\ No newline at end of file
+11341308
\ No newline at end of file
diff --git a/go/current/hiddenapi/filtered-flags.csv b/go/current/hiddenapi/filtered-flags.csv
index 4c5d4c2..b47961a 100644
--- a/go/current/hiddenapi/filtered-flags.csv
+++ b/go/current/hiddenapi/filtered-flags.csv
@@ -65,8 +65,8 @@ Landroid/media/MediaCommunicationManager$SessionCallbackRecord;->hashCode()I,cor
 Landroid/media/MediaCommunicationManager;->getSession2Tokens()Ljava/util/List;,public-api,sdk,system-api,test-api
 Landroid/media/MediaCommunicationManager;->getVersion()I,public-api,sdk,system-api,test-api
 Landroid/media/MediaController2$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/media/MediaController2$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/media/MediaController2$$ExternalSyntheticLambda2;->binderDied()V,public-api,sdk,system-api,test-api
+Landroid/media/MediaController2$$ExternalSyntheticLambda1;->binderDied()V,public-api,sdk,system-api,test-api
+Landroid/media/MediaController2$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/MediaController2$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/MediaController2$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/MediaController2$2$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
@@ -233,8 +233,8 @@ Landroid/media/MediaSession2Service;->onGetSession(Landroid/media/MediaSession2$
 Landroid/media/MediaSession2Service;->onUpdateNotification(Landroid/media/MediaSession2;)Landroid/media/MediaSession2Service$MediaNotification;,public-api,sdk,system-api,test-api
 Landroid/media/MediaSession2Service;->removeSession(Landroid/media/MediaSession2;)V,public-api,sdk,system-api,test-api
 Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda2;->binderDied()V,public-api,sdk,system-api,test-api
+Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda1;->binderDied()V,public-api,sdk,system-api,test-api
+Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/MediaTranscodingManager$OnTranscodingFinishedListener;->onTranscodingFinished(Landroid/media/MediaTranscodingManager$TranscodingSession;)V,sdk,system-api,test-api
@@ -724,7 +724,6 @@ Landroid/media/internal/guava_common/collect/ImmutableCollection;->addAll(Ljava/
 Landroid/media/internal/guava_common/collect/ImmutableCollection;->clear()V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableCollection;->contains(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableCollection;->iterator()Ljava/util/Iterator;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/media/internal/guava_common/collect/ImmutableCollection;->readObject(Ljava/io/ObjectInputStream;)V,sdk
 Landroid/media/internal/guava_common/collect/ImmutableCollection;->remove(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableCollection;->removeAll(Ljava/util/Collection;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableCollection;->retainAll(Ljava/util/Collection;)Z,core-platform-api,public-api,sdk,system-api,test-api
@@ -775,7 +774,6 @@ Landroid/media/internal/guava_common/collect/ImmutableMap;->isEmpty()Z,core-plat
 Landroid/media/internal/guava_common/collect/ImmutableMap;->keySet()Ljava/util/Set;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableMap;->putAll(Ljava/util/Map;)V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/media/internal/guava_common/collect/ImmutableMap;->readObject(Ljava/io/ObjectInputStream;)V,sdk
 Landroid/media/internal/guava_common/collect/ImmutableMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableMap;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableMap;->values()Ljava/util/Collection;,core-platform-api,public-api,sdk,system-api,test-api
@@ -784,7 +782,6 @@ Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet$EntrySetSerial
 Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet$EntrySetSerializedForm;->serialVersionUID:J,sdk
 Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet;->contains(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet;->readObject(Ljava/io/ObjectInputStream;)V,sdk
 Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet;->size()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableMapEntrySet;->writeReplace()Ljava/lang/Object;,sdk
 Landroid/media/internal/guava_common/collect/ImmutableSet$SerializedForm;->readResolve()Ljava/lang/Object;,sdk
@@ -792,7 +789,6 @@ Landroid/media/internal/guava_common/collect/ImmutableSet$SerializedForm;->seria
 Landroid/media/internal/guava_common/collect/ImmutableSet;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableSet;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableSet;->iterator()Ljava/util/Iterator;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/media/internal/guava_common/collect/ImmutableSet;->readObject(Ljava/io/ObjectInputStream;)V,sdk
 Landroid/media/internal/guava_common/collect/ImmutableSet;->writeReplace()Ljava/lang/Object;,sdk
 Landroid/media/internal/guava_common/collect/ImmutableSortedMap$1EntrySet$1;->get(I)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableSortedMap$1EntrySet$1;->size()I,core-platform-api,public-api,sdk,system-api,test-api
@@ -821,7 +817,6 @@ Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->lowerKey(Ljava
 Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->navigableKeySet()Ljava/util/NavigableSet;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->pollFirstEntry()Ljava/util/Map$Entry;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->pollLastEntry()Ljava/util/Map$Entry;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->readObject(Ljava/io/ObjectInputStream;)V,sdk
 Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->serialVersionUID:J,sdk
 Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->size()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/ImmutableSortedMap;->subMap(Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/SortedMap;,core-platform-api,public-api,sdk,system-api,test-api
@@ -922,7 +917,6 @@ Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->keySet()Ljava
 Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->putAll(Ljava/util/Map;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->putIfAbsent(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->readObject(Ljava/io/ObjectInputStream;)V,sdk
 Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->remove(Ljava/lang/Object;Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/media/internal/guava_common/collect/MapMakerInternalMap;->replace(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
diff --git a/go/current/hiddenapi/filtered-stub-flags.csv b/go/current/hiddenapi/filtered-stub-flags.csv
index 84d733b..683a1d9 100644
--- a/go/current/hiddenapi/filtered-stub-flags.csv
+++ b/go/current/hiddenapi/filtered-stub-flags.csv
@@ -65,8 +65,8 @@ Landroid/media/MediaCommunicationManager$SessionCallbackRecord;->hashCode()I,cor
 Landroid/media/MediaCommunicationManager;->getSession2Tokens()Ljava/util/List;,public-api,system-api,test-api
 Landroid/media/MediaCommunicationManager;->getVersion()I,public-api,system-api,test-api
 Landroid/media/MediaController2$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/media/MediaController2$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/media/MediaController2$$ExternalSyntheticLambda2;->binderDied()V,public-api,system-api,test-api
+Landroid/media/MediaController2$$ExternalSyntheticLambda1;->binderDied()V,public-api,system-api,test-api
+Landroid/media/MediaController2$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/media/MediaController2$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/media/MediaController2$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/media/MediaController2$2$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
@@ -232,8 +232,8 @@ Landroid/media/MediaSession2Service;->onGetSession(Landroid/media/MediaSession2$
 Landroid/media/MediaSession2Service;->onUpdateNotification(Landroid/media/MediaSession2;)Landroid/media/MediaSession2Service$MediaNotification;,public-api,system-api,test-api
 Landroid/media/MediaSession2Service;->removeSession(Landroid/media/MediaSession2;)V,public-api,system-api,test-api
 Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda2;->binderDied()V,public-api,system-api,test-api
+Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda1;->binderDied()V,public-api,system-api,test-api
+Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/media/MediaTranscodingManager$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,system-api,test-api
 Landroid/media/MediaTranscodingManager$OnTranscodingFinishedListener;->onTranscodingFinished(Landroid/media/MediaTranscodingManager$TranscodingSession;)V,system-api,test-api
diff --git a/go/current/sdk_library/public/framework-media.srcjar b/go/current/sdk_library/public/framework-media.srcjar
index 2bc0d64..b7b829e 100644
--- a/go/current/sdk_library/public/framework-media.srcjar
+++ b/go/current/sdk_library/public/framework-media.srcjar
diff --git a/go/current/snapshot-creation-build-number.txt b/go/current/snapshot-creation-build-number.txt
index fffc196..ed90a08 100644
--- a/go/current/snapshot-creation-build-number.txt
+++ b/go/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10917791
\ No newline at end of file
+11341308
\ No newline at end of file