[automerger skipped] Merge "Fix User Switch Timeout Issue" into main am: fe9c3c82ce am: 1efd64a53e -s ours

am skip reason: Merged-In I0d83bb51b63d49e0a69a143c834572c4192c9f24 with SHA-1 d98371fb06 is already in history

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

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