Merge "Move some utils to a more appropriate package/directory" am: 6bf9a90a55 am: 77fd539623

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

Change-Id: Ieadf69ef0d04ed15e8205b8d6982fb3c83a543c3
tree: 5c58de645fed115e6f63941cac2e6b0f4e612c9a
  1. tests/