[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: ac4f9ef5ce -s ours

am skip reason: Merged-In I310cd8a614006c391407829ada587d892a0ac3b4 with SHA-1 d3d139a80d is already in history

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

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