Merge "Add contender method for lock contention" into nyc-dev
am: 0e7316828d

* commit '0e7316828d5a92f7a0771886a131b96f4dd6c117':
  Add contender method for lock contention

Change-Id: I2e65f579ae94cfbab4e85443d7497e40f82c5492