am f14d72d8: am 7d12781a: Merge "Add additional context to the contention event logging." into gingerbread

Merge commit 'f14d72d8d8ec023021d94bbf91fddf9f292225dd'

* commit 'f14d72d8d8ec023021d94bbf91fddf9f292225dd':
  Add additional context to the contention event logging.