Merge "Add multi-user jank monitoring" into sc-v2-dev am: 89f022ac99

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

Change-Id: I8f5811c0f3d625c13422a9bcb050295bf7789368