[automerger skipped] Merge "Add tradefed-test-framework to the suites exported...

[automerger skipped] Merge "Add tradefed-test-framework to the suites exported jar" into rvc-dev am: 849d4b3f am: 060d107c -s ours am: 815181ac -s ours

am skip reason: Change-Id If29508f3dd30939be603ed03f2536c960ca40d92 with SHA-1 fae54cbd is in history

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

Change-Id: I94126add4ef7efc00e367581742ab7e3b43f2f3e