Merge "Properly handle pending intent for multi-user" into tm-dev am: cafcc80f5e

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

Change-Id: I7de4e493028ad75a911a54a47dcd88ba7fe80182