Merge changes I1aca68f2,I896eb92c into main am: 18f80efe93 am: 1d7ee6cfb2 am: c6766d6ccb

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

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