[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 638de69a67 -s ours

am skip reason: Merged-In I9c7954737e882d89c7d4b4066aca1c01f5b2f1be with SHA-1 6c76a700be is already in history

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

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