Revert "Settings : Make proximity opt-in"

This reverts commit eedd9183ff2635804852579825f54bf8d7308b5d.

Change-Id: I5c16f80501b3b1a54c02b790df2f4d3a83675ba9
Merge "Revert "Settings : Make proximity opt-in"" into kitkat3