Merge "Fix User Switch Timeout Issue" into main am: fe9c3c82ce

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

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