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

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

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