Merge "Add tool for injecting tracing code into a method." am: a7006818d3 am: 3e53e056ee

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2016118

Change-Id: If83cc7c52c09e0a226e759755e60ccc9a3412951