[automerger skipped] Tradefed () am: 41aadea878 -s ours

am skip reason: skipped by user guangzhu

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

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