Tradefed () am: 0ce49e34ae am: ec35ada483 am: 014bcd310d

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

Change-Id: Icaa9983ea90248519a893433b45ef311bbaf5944