Merge "Fix multi-user silent notifications on lockscreen" into main am:...

Merge "Fix multi-user silent notifications on lockscreen" into main am: fc66de20 am: b88ef072 am: a8c202a2 am: 6da1166f am: 1ae9ea00 am: c0638ffa

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



Change-Id: I3b1f1ab3daac44ae0f42a3ca8943f76efbe626bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>