Merge "Change aosp/1912773 moved a few functions to a new file and broke a support function for our test. Updating the test to point to the new location in code." into sc-dev am: 0d168698b3 am: a680aee32b

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

Change-Id: I9594705717cdf7ae219d10455f1e2bdc6349a357
tree: aac8606a90601a97b41d98ca989b1ed8d74ed026
  1. acts/
  2. acts_tests/
  3. tools/
  4. wts-acts/
  5. Android.mk
  6. OWNERS
  7. PREUPLOAD.cfg