Merge changes I6a860b4d,I9a03d3b4,Ie959e1fb into main am: fa0e3a6c9c am: 9993d5c238

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

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