PowerManager : Make proximity check opt-in

Change-Id: I7cf64a82530da2e655018e43683ba7a5584d54f8
Merge branch 'cm-11.0' into kk_mkt

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

Change-Id: I4eb1f8976f87777e2ce4d10423ee6797d5495a3b