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

* commit '10213888add66cda37de12c002fec27e82c96ba6':
  DO NOT MERGE Tracing for binder locks/transactions