Remove circular import errors am: 15cc7b25d1 am: 5cc00f3816

Original change: https://android-review.googlesource.com/c/platform/tools/test/connectivity/+/1991410

Change-Id: I6b09eb44290af4aee89a9e0015c29f3c3b2cceae
tree: 26e74a315a72a18d2c3a61f8e3a07401df604a88
  1. acts/
  2. acts_tests/
  3. tools/
  4. wts-acts/
  5. Android.mk
  6. LICENSE
  7. OWNERS
  8. PREUPLOAD.cfg