Remove circular import errors am: 15cc7b25d1

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

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