Unbreak PIN/Password lockscreen options

Change I0211deea61b2d5b048deb118c30fc1397a56d3ee slightly changed
the validation conditions for this case, fixit.

Change-Id: I6219f47f4b0acb87b5d8d4a121480b09a8aa12b2
Build V42
Merge branch 'cm-11.0' of https://github.com/temasek/android_packages_apps_Settings into cm-11.0

Conflicts:
	res/values/cr_strings.xml

Change-Id: Ic8863a62315563b586e3a2067e3ace73fc995070