Merge changes I09dc9d09,Ia5b67218 into main am: 020b0e56b1

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

Change-Id: I84d730da24c92d50721d8b27d7e009979b7db0fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: d983adbe49b5b5e31c870bd1aab97cc2d926e6a3
  1. acts/
  2. acts_tests/
  3. tools/
  4. wts-acts/
  5. Android.mk
  6. LICENSE
  7. OWNERS
  8. PREUPLOAD.cfg