Backport multi user trace changes.

Bug: b/190233841

Test: Builds successfully
Change-Id: I9fb702d51eeac4749097ea34d44bf78c202a288a
Merged-In: I1661558dced6cb326ce11c94672b60f0352eab3c
3 files changed