Merge "tracing: add instrumentation for tracing service reports" am:...

Merge "tracing: add instrumentation for tracing service reports" am: da6c7062 am: 0b53d3bb am: 9c5a17d4

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

Change-Id: I4f88e61f2555b891f8363d1ca449f2ec361f28ae