Merge changes I09dc9d09,Ia5b67218 into main am: 020b0e56b1 am: 2324b63b0d am: 427371b04d

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

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