Merge cherrypicks of ['googleplex-android-review.googlesource.com/24048040']...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24048040'] into udc-release. am: b92c997a

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/StatsD/+/24091807



Change-Id: I7a60256e4f52fcf65badb1efdd6da9019337a654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

.prebuilt_info/prebuilt_info_current_current_zip.asciipb

 drops {
   android_build_drop {
-    build_id: "T1007089"
+    build_id: "T1007284"
     target: "train_build"
     source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.os.statsd/sdk/statsd-module-sdk-current.zip"
   }

current/snapshot-creation-build-number.txt

-10351819
\ No newline at end of file
+10484568
\ No newline at end of file