Settings: Add option to scramble pin layout when unlocking (1/2).

Change-Id: I3e2c200a0a31d3c765831bc30280029a50c88051
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Remove scramble pin added by lats merge: https://github.com/CyanogenMod/android_packages_apps_Settings/commit/a8391354c884d56fc750328065a978ded7eb7696 crDroid already have it for a long time

Change-Id: I9d067bdeba3b2b66d5baf62b47fbacd40d75f8b1