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

Change-Id: Ide092b9c6e036a59cca6c29cee658110a6cfa947