Settings: Move "Double-tap to sleep" option under Display settings

Move dt2s above dt2w option so users don't get confused.

Change-Id: I910eb6624536b437d0bf14f64c1eeacafaa59cfa
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into DJL11

Conflicts:
	res/xml/status_bar.xml

Change-Id: I2b724845fbcf8c6475a38014b64b41ab501b79e1