Merge changes I835008be,I200058ce into main am: 4765476646

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

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