Revert "Port: Wake on plug (2/2)"

This reverts commit 83df8fba79e5e20dc8a5e117f068a526566981c6.

Conflicts:
	res/xml/display_settings.xml

Change-Id: If17303c21f82776374c60b1aefa15af28f1953ee
Port: Wake on plug (2/2)

Change-Id: I22ee2a05040561cca796814573adc5226f1f03d4

Conflicts:
	res/xml/display_settings.xml
fix mismerge

Change-Id: Ie9772fca6399b09a7389d0acb215baf2cf190104