[automerger skipped] Merge "Backport multi user trace changes." am: 3bf3a055...

[automerger skipped] Merge "Backport multi user trace changes." am: 3bf3a055 -s ours am: 7034d646 -s ours am: 9eb4a543 -s ours am: 95d202d3 -s ours am: 5d135f00 -s ours

am skip reason: Merged-In I1661558dced6cb326ce11c94672b60f0352eab3c with SHA-1 7d84ba8c is already in history

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

Change-Id: Icad0a7d830cf9e3f72ae3539dfff1ddd6e60dea3