Settings : Make proximity opt-in

Change-Id: Idfa64758a3c6d60ca4801f6f7f34f0429f95cbec

Conflicts:

	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java