Fix in lockscreen custom image transparency

Change-Id: I1d536a2164e11f6e6f6c555efdfb38d4620e2b44

Conflicts:
	core/java/android/provider/Settings.java