full rebase to cm's Lockscreen wallpaper

picked from:

   https://github.com/CyanogenMod/android_frameworks_base/commit/032650221f8f164b4c5f43d8488e569294faa0fc
   https://github.com/CyanogenMod/android_frameworks_base/commit/28070f9e0b9ef5b43e2a9c2196c5d7c3226100ee
   https://github.com/CyanogenMod/android_frameworks_base/commit/ec4fb56444ae2b6a846f829730a6e07ccfd5ccc0
   https://github.com/CyanogenMod/android_frameworks_base/commit/7bd5eaa5dd5d8cbed1cb7b6563176bc034d8a9f4

Change-Id: I39bcc08d39eeeda78474ba7a6d828690bb66b342

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