Revert "Fix User Switch Timeout Issue"

This reverts commit d98371fb06c7fa07e00ba15fb0ef6b7495c34aa8.

Reason for revert:  b/322666316
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:93986f1d203422dac8c11d130b7b9fa39da8e8aa)
Merged-In: I37a94bffcfe8278a609caa485675bee693ec8773
Change-Id: I37a94bffcfe8278a609caa485675bee693ec8773
15 files changed