Forward port "Display options: allow configuration of wake on plug behavior"

From http://review.cyanogenmod.org/#/c/47159/

Change-Id: If1d50cbad76763bb8e12b2e7a4f7c21f42a58f31
Merge "Forward port "Display options: allow configuration of wake on plug behavior"" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into wszf

Conflicts:
	res/xml/display_settings.xml

Change-Id: Id049a084fbfe593369384a2cc0603c09131199f7