Revert "Fix User Switch Timeout Issue"

This reverts commit d98371fb06c7fa07e00ba15fb0ef6b7495c34aa8.

Reason for revert:  b/322666316

Change-Id: I37a94bffcfe8278a609caa485675bee693ec8773
15 files changed