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: 1b35aef1 am: f365baec

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

Change-Id: I255d64886bc30a9c3e7b12795f1f370959f230f4