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

Change-Id: Ia3c2254b7ffd843a5514a668d7290c3c169af301