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

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

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