Display options: allow configuration of wake on plug behavior

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