Revert "Fix User Switch Timeout Issue"

This reverts commit a7bacefff2bd10fb95320b67a0d0b4b11f2b136f.

Reason for revert: b/322666316

Bug: b/319352292#comment8

Change-Id: I0b66c5149284498f45b2b01fe68c959de18f5886
Merged-In: I37a94bffcfe8278a609caa485675bee693ec8773
15 files changed