Settings: Fix AOSP WiFi AP translations

* Add missing spaces between SSID and AP security

Change-Id: Idcd284a16cbd10a0e73db8bfda988f2ad3e6e6f1
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 https://github.com/CyanogenMod/android_packages_apps_Settings into kitkat