Forward port pattern visibility settings (2/2)

Conflicts:
	res/values/cm_strings.xml
	src/com/android/settings/lockscreen/LockScreenSettings.java
Change-Id: Ic627953c5df854c442671a98b5da539b994da18b

Conflicts:
	res/values/slim_strings.xml
	src/com/android/settings/SecuritySettings.java
4 files changed