Merge changes I66641da0,I84e7d877 into main am: 922536fbb3

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

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