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

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

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