Revert "Use ConcurrentHashMap to make private maps thread safe"

This reverts commit d511538361fe9f20406e92b4f3dea66ac737663d.

Reason for revert: Droidmonitor created revert due to b/367736714. Will be verifying through ABTD before submission.

Change-Id: I01281bd48c4ba7d07dc0308c504f21aad751ea44
2 files changed