Merge changes from topic "topic_sc-dev" into tm-dev am: 227566aeb0

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

Change-Id: If12c3c0d27b2f424d2a3d766c94bbd694df0c641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 046031523398edff783b0c02e789b2bd25bcd593
  1. filegroups/
  2. test_harness/
  3. OWNERS