tree 0023451248080755f686403118553ca5a88dc772
parent 9042dcd15f793c5d3a949ed9294fe3ef74a2f339
parent 35a8fcfc24af29a7a8aa830215377bcac1009434
author TreeHugger Robot <treehugger-gerrit@google.com> 1655424498 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1655424498 +0000

Merge changes from topic "topic_sc-dev" into sc-mainline-prod am: 31bd4bd5d7 am: 35a8fcfc24

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

Change-Id: Ib6c950e21add7586ebdaea2a6974aa64d9666a49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>