[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: addfc67594 -s ours

am skip reason: Merged-In I49911a862ef8d841a3f66d199a8c876fc6f8bf1f with SHA-1 0853f132e3 is already in history

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

Change-Id: Ib8fa8ced942495b91d7e9520bbc69ac4ee26c0d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>