Merge changes from topic "networkstack_v19" into main am: aaa05d124e am: 0933c375cc am: 80372e3ab0

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

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