Made sure to unlock the pending unlock if the user is being switched

Whenever the user switches and we still have a pending unlock, we
should not bypass anymore.

Bug: 134094877
Test: atest SystemUITests
Change-Id: I46e179748ecc7dc5e283fd7f0ef6c2968c5ae294
2 files changed