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

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

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