Fix HighTouchSensivity (1/2)

Change-Id: I3d3207fefef496ba787055b1598c60b327ab9bb6

Conflicts:
	src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
Settings: Fix AOSP WiFi AP translations

* Add missing spaces between SSID and AP security

Change-Id: Idcd284a16cbd10a0e73db8bfda988f2ad3e6e6f1