Wake On Plug (2/2)

Change-Id: I3caa01e328ec5f803804b337072cda5a74f06fac

Conflicts:
	res/values/cm_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java
Revert "Wake On Plug (2/2)"

This reverts commit f1c74b375696b6fa6c1c5f9a787fc3fb39fbf8ac.