fixup after merge
Revert "Keyguard: Add customizable lockscreen background"

This reverts commit 060230306035aec74690e64a4e4f030e679f1d51.
Frameworks: Lockscreen custom wallpaper (1/2)

kitkat now has code for a custom wallpaper image.

Using that code set a switch case to set the custom background between
  - Custom Wallpaper
  - Default background

This way allows the same overlay shadow thats set on the keyguard when
its the defualt way.

Change-Id: I98fde63ef9f3c0a5f334cd9a97b237a6f99c57f6
Revert "settingsprovider: Set default value of animator duration scale"

This reverts commit 8fb9df1f70297b7dff9f00b294228f396c9f14a3.
Revert "Allow configuration of the default screen-off animation style"

This reverts commit 0af186e01b06b13b4270c6a95de9b5e66c1e74a0.
settings: add missing variable
Remove DEFAULT_THEME_APPLIED_ON_FIRST_BOOT

doApplyDefaultTheme should be able to apply the default theme, if
one exists, whenever applyDefaultTheme() is called.

Change-Id: Ia50b4089d122855a4ddde91a02eef33ed3f9eaf4

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