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

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

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