[automerge] Tradefed (VanillaIceCream) 2p: bbb78e2994 am: fefc9ff708 am: e58bb5ede6

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

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