Merge "Revert "Fix User Switch Timeout Issue"" into main am: b2bce97cce

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

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