Settings : Make proximity opt-in

Conflicts:
	src/com/android/settings/DisplaySettings.java

Change-Id: I348de6b0254b5d1f95a9fc679cd8740e96c36be5