[automerger skipped] Merge "Tradefed (S-7340499)" am: 45b10d30b9 am: 15a11a970f am: 88f3a3013c -s ours

am skip reason: skipped by user frankfeng

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

Change-Id: I478075b84cfd6275b57b8d2845d61e948f5484e3
tree: 9f19c9f8ae57b82fca5f73d38c4ffdda70966b80
  1. filegroups/
  2. test_harness/
  3. OWNERS