[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: bde6e4224e -s ours

am skip reason: Merged-In I9293619aace80d52a3765f60f36bbddb8c3d8181 with SHA-1 d6823d1dce is already in history

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

Change-Id: I07c4aab08db3159d23ca4bdbb4b80228d428d6c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 26fc355e6e4cdef4cced43bf50ee906c72058544
  1. res/
  2. src/
  3. tests/
  4. .classpath
  5. .gitignore
  6. .project
  7. Android.bp
  8. OWNERS
  9. PREUPLOAD.cfg
  10. README
  11. README.txt