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

am skip reason: Merged-In I9af4651102eeba16468c3bae296801f62c1606b2 with SHA-1 2cd169e4b9 is already in history

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

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