Merge changes I1aca68f2,I896eb92c into main am: 18f80efe93

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

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