Revert "Fix: Custom lockscreen force close"

This reverts commit 6af4b210145c34c0249ef703b8ba33f0ed4ca6e8.

Change-Id: Ia5956d70bbc8a98d141ff64e11a575e410d99952
Merge "Revert "Fix: Custom lockscreen force close"" into kitkat
Revert "Custom lockscreen"

The UI of the feature does not fit android guidelines and the feature itself seems a bit too much for me.

This reverts commit 2fa74b852a8e5750adbb5fa2f8db2b935ce56f06.

Change-Id: I3641ffba528b128015dbc1917938d472807a10db
Merge "Revert "Custom lockscreen"" into kitkat
Merge branch 'kitkat' of https://github.com/AOSPA/android_frameworks_base into kitkat

Conflicts:
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java

Change-Id: I6012dce563c299d1ca42537f2940d29c6428f788