Fix speed up booting compile error
Merge "Lockscreen custom wallpaper [1/2]" into kk44

Signed-off-by: scott <scott@ubuntu.com>

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

Change-Id: I9d9a2a316db9deef78d975884aec2670b6f75e0e

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