Settings : Make proximity opt-in

Change-Id: Idfa64758a3c6d60ca4801f6f7f34f0429f95cbec
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Follow normal lock screen convention - allow user to retry when creating pattern lock

Change-Id: I6ad39b07b8de3de03146322b37b60e3f846093d1
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Merge branch 'androidarmv6/cm-11.0'