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

Change-Id: Ibba54026a3218d10e9b4a200c94b5bcd5a488e22
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index a22feda..73afe0c 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.adservices/sdk/adservices-module-sdk-current.zip"
   }