Merge "base: add support for routing traces to reporters" am: 3a24d6bffb am: 26a716c74e

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

Change-Id: Ie12e3b039837db7cd218f5d5c797337a26377824