Merge "Move cts-unit-tests to cts-tradefed" am: 9eb7f01f01

Original change: https://android-review.googlesource.com/c/platform/test/suite_harness/+/1508761

Change-Id: I5f58f27780ab77bf1ae38a8b348de8473fda7c7c