DO NOT MERGE Tracing for binder locks/transactions am: 97e5be36e3 am: 10213888ad  -s ours
am: 2ae1449056

* commit '2ae14490565c62cb6c0a95710935130495e48778':
  DO NOT MERGE Tracing for binder locks/transactions