Tradefed (Tiramisu) am: f0a6588ded am: 2f77b1753a

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

Change-Id: Ied7aeb899755df3bd984c6f3a71ddf422dd832bd