Revert "Settings: Add support for variable size pattern lockscreen (Part 2/2)"

This reverts commit d0aa0c016d8ab33e1a079023b49446a7ce563b9d.
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Settings into HEAD

Android 4.2.2 release 1

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml