Unbreak PIN/Password lockscreen options

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

Change-Id: I6219f47f4b0acb87b5d8d4a121480b09a8aa12b2

Conflicts:
	src/com/android/settings/SecuritySettings.java
PrivacyGuard: confirm permissions reset

The button to reset all application permissions to enabled looks
suspiciously like a refresh button. Prompt the user with a confirmation
dialog to make sure they know what they've pressed.

Change-Id: I0444c5bf8e9533feccf890055d34d3200609c6f6