Revert "The big keyguard transition refactor (1.1/n)"

This reverts commit a3b50cc1baae57f97f29c995705c3918b44b9545.

Change-Id: I6db7d00d671556084d4903803c7d180ad7d091ca
Fixes: 32598209
1 file changed