Tradefed (Tiramisu) am: 3a8bad6786 am: 29813b76a1

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

Change-Id: I1ad90840aca37829e0171c8858a2e03e197b626d