Add scramble pin layout global setting.

Change-Id: Ic4173a0d65e6bc22ea5ab3061139af12582aac5a
Keyguard: Add option to scramble pin layout when unlocking (2/2).

Change-Id: Ibe8611eb0b8a5bd9275bc96682d2cbafaa37d8f5
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0

- This merge removes scramble pin option: https://github.com/CyanogenMod/android_frameworks_base/blob/68430df6054a1190e1787d971c159ae67e9acb96/packages/Keyguard/src/com/android/keyguard/NumPadKey.java

Conflicts:
	core/java/android/provider/Settings.java
	packages/Keyguard/src/com/android/keyguard/KeyguardPINView.java
	packages/Keyguard/src/com/android/keyguard/NumPadKey.java

Change-Id: I9977385dd32c2d94263c51af1e875a86fb88bfa4
Filter Notifications : Adjust string

Change-Id: I797cef15fcbd2ebca1d411a71cae75aaf3b478f1
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'cr/cm-11.0' into kk