make mapRetrieveWO take exclusive lock am: 7eb7d67279 am: 2c8345d94f

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

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