Merge "base: add support for routing traces to reporters" am: 3a24d6bf am:...

Merge "base: add support for routing traces to reporters" am: 3a24d6bf am: 26a716c7 am: a70c08c6 am: 8df5573e

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

Change-Id: I3831fc11a7c105177256fe4f3e0fad53f03da319