Merge "Add a test for concurrent access" am: 4840a772c2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iafc8b4bf4717353011714c06dbeae5e90cf2e9c5