Merge changes I1aca68f2,I896eb92c into main am: 18f80efe93 am: 1d7ee6cfb2

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

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