Merge "Tradefed (S-7340499)" am: 45b10d30b9 am: 15a11a970f

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

Change-Id: If6ba71e824f6ecf405fadb6ce6b5678a0d7fe15b
tree: 30d68bdff81b832bb67650077601073dbd4b2e26
  1. filegroups/
  2. test_harness/
  3. OWNERS