Merge changes I81b2115b,Ibe22be62 into main am: 066d1e4669 am: f56ba422a2 am: 898e72e294 am: ac5f4311be am: 82dd053a0e

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

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