Framework: Restore Keyguard-obsolete to AOSP state

Some of the CM features code got merged into the obsolete keyguard
code, revert to pure AOSP state.

Change-Id: I6980f9254b49cf1208dd1536f625951d804445ae