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

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

Change-Id: Ie1f093096383dc96a1dc9921c5f13ef77bad73d3