make java maps grab locks am: 9eca02a8fa

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

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