[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 21994ae251 -s ours am: f636673c51 -s ours am skip reason: Merged-In I43b14a81c73056c5fad4e51347fb9607cdab34dc with SHA-1 f84c9522a6 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/tools/+/3258455 Change-Id: I68220c3ad6f41bfb8b336b7ab5792b6bd926e830 Signed-off-by: Automerger Merge Worker <[email protected]>