am 1e4fbd8b: Merge "Using the correct time for wait_start_ms when lock contention logging is enabled" into lmp-dev

* commit '1e4fbd8b7d65064d087c5afe812943b203ed205a':
  Using the correct time for wait_start_ms when lock contention logging is enabled