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

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

Change-Id: I99d8f5456585dceda748857f525a2eee8c73a337