[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 -s ours am: 690a3521 -s ours am: 51496113 -s ours am: c2f4abb2 -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: Ia56ab9d19b51ad51d1550c9d4a96dd0167d8de24