PowerManager : Make proximity check opt-in

Conflicts:
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
	services/java/com/android/server/power/PowerManagerService.java

Change-Id: I4b67ad0b51882108baf1c494e38803af53312b0b