Merge "Change TestBpfMap to use ConcurrentHashMap" am: 3975785347

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1972878

Change-Id: I16cab0ac7413bc454ebbee045267b8d9f8110dce