[automerger skipped] Merge "Backport multi user trace changes." am: 3bf3a055c7 -s ours am: 7034d646d5 -s ours
am skip reason: Merged-In I1661558dced6cb326ce11c94672b60f0352eab3c with SHA-1 7d84ba8cbc is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1838033
Change-Id: Ibc1644ac4c57a17cc18623613b9568ef3636ebe3
This commit is contained in: