[automerger skipped] Merge aosp-24Q3-ts-dev am: 4bf36180fb -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: Ieaedd9d64d3b20d888f4f75f7b181169736c00ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>