[automerger skipped] Merge "Backport multi user trace changes." am: 3bf3a055c7 -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: I95a5c891b6cf6d14f96d803dfd8db6ebe851879c