Merge changes I1aca68f2,I896eb92c into main am: 18f80efe93 am: f8a7c70a33

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

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