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 remote-tracking branch 'CM/cm-11.0' into cm-11.0