This reverts commit a527b1a0ee.
Reason for revert: tradefed-contrib isn't an allowed dependency outside tradefed. Suites shouldn't use it. This breaks prebuilts in udc-*
Bug: 280372052
Change-Id: Id840568f36a801e19e7bb8e9c34cef2aeb625f1d
Ignore-AOSP-First: revert of CL submitted in internal anyway