Settings : Make proximity opt-in

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