Merge "Change ConcurrentMap::setLocked() to take a const K& instead of K&&." am: c7998b6509 am: 00f4e352b0

Change-Id: I459c918673750a45bdeda8b5d6075a149b40ccc6