Merge changes Ife2d53f7,I0ad35c7e,Ia7555e5e,I0798fbd0,I74531df2, ... into main am: e3c585c758 am: dfd6ef0bbf

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

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