Settings : Make proximity opt-in

Change-Id: Idfa64758a3c6d60ca4801f6f7f34f0429f95cbec
(cherry picked from commit 02fb6137c46a02864d4bb804df80fc56a6e28e48)