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

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

Change-Id: I0e6b4d2cf573f6dca8c7d2f5850adc0f542ff70d