[automerge] Tradefed () 2p: 3c61ee7996 am: cd01d12ad6 am: 8803c0d18c am: 00723c6f89

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

Change-Id: I3935af23d2ddfd933f72fa553416c45b950d7e15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>