Lockscreen custom wallpaper [1/2]

Change-Id: I47ac785cd650bafe218cd9417b890c31e3a234cf

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