add Custom Lockscreen switch

Change-Id: I3cc14cacf5462f589373b686f0dd87100507d524

Conflicts:

	core/java/android/provider/Settings.java