Revert "Settings: Added choice of 45 seconds for screen timeout, lock screen and dream."

This reverts commit 7414636e6f05757e652965b321635935d204b2ea.
Add SuperSU to Settings and may hide SuperUser or vice versa

If SuperSU is installed, show an entry in Settings below
"Developer options", which launches SuperSU when tapped.
At boot time SuperSU will detect if com.android.settings
contains the resources from this patch, and if so it
will hide itself from the launcher. This was implemented
in v1.85, so we only show the entry if the installed
SuperSU version is at least that.

Change-Id: I1796d92458587b9e961d5d8e6d58099e8367834d

Conflicts:
	res/values/strings.xml
	res/xml/settings_headers.xml