Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Unbreak PIN/Password lockscreen options

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

Change-Id: I6219f47f4b0acb87b5d8d4a121480b09a8aa12b2
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge branch 'sgt7/cm-11.0'