[automerger skipped] Merge "Revert "Fix User Switch Timeout Issue"" into main...

[automerger skipped] Merge "Revert "Fix User Switch Timeout Issue"" into main am: b2bce97c am: 80cefa4d -s ours

am skip reason: Merged-In I37a94bffcfe8278a609caa485675bee693ec8773 with SHA-1 93986f1d is already in history

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



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