Merge "Add multi user specific trace config." into sc-dev am: fddad8e2 am:...

Merge "Add multi user specific trace config." into sc-dev am: fddad8e2 am: fcb789bd am: 7b653786

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

Change-Id: I76cd44f8c7d32812c8f3c661af2fb686f68b86ec