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

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

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