[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 283b2fd370 -s ours

am skip reason: Merged-In I00e3bb72aa5d78fdf022ef5c92b0e47bf7a56d51 with SHA-1 daedd8c2a1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/tradefederation/contrib/+/27909659

Change-Id: I8924ae095ecc48a12b562e4faf61f37f5d19e672
Signed-off-by: Automerger Merge Worker <[email protected]>