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

This reverts commit 2925663ca0743afd3971f29b3bde18f7c9d4b95d.

Change-Id: I4a6bd5b512ea250cec4931acd9d0efc464989e84
Merge remote-tracking branch 'omni/android-4.4' into android-4.4