Settings : Make proximity opt-in

Change-Id: Idfa64758a3c6d60ca4801f6f7f34f0429f95cbec
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into android-4.4