Merge "Fix flaky because of multi-threads access" into main am: 20f045bae3

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

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