Duplicate Lockscreen Settings Derp
Revert "Framework: GlowPad Torch"

This reverts commit d680fb4157b5c79f4ff4305969e2bd2f079b58db.

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