[automerger skipped] Merge "Merge aosp-24Q3-ts-dev" into aosp-main-future am: 75aeefca8f -s ours

am skip reason: Merged-In I651dae8c9daac24b195196c03b54e69a757de8a7 with SHA-1 732278a3b4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/28853003

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