make java maps grab locks am: 9eca02a8fa am: c853c07517

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

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