[automerger skipped] Merge Android 12 am: ab62e827 -s ours am: 2f5d3feb -s...

[automerger skipped] Merge Android 12 am: ab62e827 -s ours am: 2f5d3feb -s ours am: d5aa0ea5 -s ours

am skip reason: Merged-In Ib14056ad67d77243cb72992b4e90457dbdccaa04 with SHA-1 a960e23f is already in history

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

Change-Id: I4dccee0677d0026bb3b5847099dacc9af1aa834a