Merge "Fix multiuser freeze-kills" into main am: d33df980

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



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