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

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

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