[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: ac4f9ef5ce -s ours am: 6291ec6e7d -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: Iddb300a67e5da7f8f07351b6796f706eb8266952
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>