Merge "Add google-tradefed's config path to tradefed_tests_dir" into main am:...

Merge "Add google-tradefed's config path to tradefed_tests_dir" into main am: ad274cc0 am: 40fde746

Original change: https://android-review.googlesource.com/c/platform/build/+/3502993



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