Tradefed () am: 0f9de31e2b am: e18b946c76

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

Change-Id: Ib4bcf0a0aba2967b7cecb0e750824dca0a28af1a