Settings: Lockscreen custom wallpaper (2/2)

Change-Id: I1ac1351e9a31a5827847e30113e933f2b7da219f

Conflicts:

	res/xml/lockscreen_interface_settings.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java