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

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

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