Revert "WIP Settings: Lockscreen custom wallpaper (2/2) not merge yet"

This reverts commit ec3e7d139317c77ebcfdfe6821722655b03d4064.

Conflicts:
	res/values/pac_arrays.xml
	res/values/pac_strings.xml
	res/xml/lockscreen_style.xml
	src/com/android/settings/pac/LockscreenStyle.java

Change-Id: Ie043c045056e2acc7b3df23facec3c05692b4785