Tradefed (Tiramisu) am: f0a6588ded am: 2f77b1753a am: 718084d846

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

Change-Id: I27b5d3a837402a42e55e487f500672988b1c4aff