Merge "Fix multiuser freeze-kills" into main am: d33df980b2 am: b378e52725

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

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