[automerger skipped] Tradefed (T-7488403) am: 12687f096f -s ours

am skip reason: Merged-In I201fdf37cd17fbe4199d446e3b06bc338fdf3e07 with SHA-1 efa1ee2e1c is already in history

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

Change-Id: I5e27403159413c0b89bf81cacc3ff5ac673aa2da
tree: fa0cb49f565f6dc1faa770589a1fe249fce67640
  1. filegroups/
  2. test_harness/
  3. OWNERS