Merge cherrypicks of ['googleplex-android-review.googlesource.com/20907885'] into tm-qpr2-release.

Change-Id: I0024228c755a822f450f7d44506d00ecb7b506a0
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 24b819b..73a3349 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,6 +1,6 @@
 drops {
   android_build_drop {
-    build_id: "T1004707"
+    build_id: "T1005166"
     target: "train_build"
     source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.media/sdk/media-module-sdk-current.zip"
   }
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 71b9b17..77360aa 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-8949820
\ No newline at end of file
+9279844
\ No newline at end of file