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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c3f67be34d617e628c033c975adc4c43035ebb2