Settings: Remove redundant lines

Change-Id: I8f049386a6860bb3990fb56013beb9c9022b8bd7
Intent now pointed correctly to ChooseLockPattern

Change-Id: I33c76f9e9ed38ad3ded37d503185e3f09f12f794
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1