[SQUASHED] Custom lockscreen wallpaper [1/2]

Conflicts:
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
	services/java/com/android/server/power/DisplayPowerController.java

Custom Wallpaper: use PNG and fix derp

This should fix the bad lockscreen wallpaper quality after reboot.

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

Conflicts:
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
Fix
Merge remote-tracking branch 'upstream/ose' into ose

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