Revert "Revert "Custom lockscreen wallpaper [2/2]""

This reverts commit c863ba9f720c58e7c907a1fa7610f31618ae0e50.

Conflicts:
	res/xml/lockscreen_settings.xml
	src/com/android/settings/AOSPAL/LockscreenSettings.java