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

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

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