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

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

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