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

Change-Id: I7dd37e95530b4a5dbe7b4980462330568a2f0a78
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 03a5e8c..f4d0604 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: "T1004816"
+    build_id: "T1005166"
     target: "train_build"
     source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.permission/sdk/permission-module-sdk-current.zip"
   }
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index dbad8c3..7c7c114 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-9016093
\ No newline at end of file
+9164532
\ No newline at end of file