Merge "Move cts-unit-tests to cts-tradefed" am: 85b55e32d8 am: ba1fd72110 am: e36cad6c8e

Original change: https://android-review.googlesource.com/c/platform/cts/+/1509052

Change-Id: I2455af7af9d238c427be3aa001b34e4d6f9a9236