Snap for 8485504 from 8bd8b591c23d4591508a0eb3d75da488e5f52870 to tm-release am: f2d384235f

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/misc/+/17899007

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