Merge changes from topic "networkstack_v19" into main am: aaa05d124e am: b7361bff42

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

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