Merge changes I1aca68f2,I896eb92c into main am: 18f80efe93

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

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