[automerger skipped] Merge "Add multi user specific trace config." into sc-dev...

[automerger skipped] Merge "Add multi user specific trace config." into sc-dev am: fddad8e2 am: f2a72d01 -s ours

am skip reason: skipped by user gelanchezhian

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

Change-Id: Ic7e311f01edecf684b9b1637a8312edaa08f3234