[automerge] Tradefed (VanillaIceCream) 2p: b611970d2d am: 2abb6d8e4c

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

Change-Id: If24f3b2fffe714bd6755a2f69930aab0d2a25f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: c6ccc24f745434bfd4b11f1c740e3f172eb8aa01
  1. filegroups/
  2. test_harness/
  3. OWNERS