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

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

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