PowerManager : Make proximity check opt-in

Conflicts:
	services/java/com/android/server/power/PowerManagerService.java

Change-Id: I7cf64a82530da2e655018e43683ba7a5584d54f8