[automerger skipped] Merge changes (ag/22410589) in ag/master branch to aosp/main branch. am: 24413ef985 am: ad2c871d02 am: bef98b25e3 am: 95a08a6516 am: 8ce27d2392 -s ours

am skip reason: Merged-In Ia399307ec4a5439d1c3322ce052d0dc1a8d158d8 with SHA-1 deae3fac75 is already in history

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

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