Merge changes I61a4877f,I669484d8 into main am: e7732c5832

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

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