Merge changes from topic "datastall-dozelight" into main am: 8f9c745119 am: c3420f2377

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

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