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

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

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