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

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

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