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

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



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