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

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

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