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

Change-Id: I5091b1bfab196870e5d55bdd21eb937f0f38ef00

.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
+10484568
\ No newline at end of file