Merge branch 'kk4.4' of https://github.com/SlimRoms/packages_apps_Settings into kk4.4

Conflicts:
	res/xml/slim_interface_settings.xml
	src/com/android/settings/accessibility/AccessibilitySettings.java
	src/com/android/settings/slim/quicksettings/QuickSettingsUtil.java

Change-Id: Ie75a8aad48e479401ee7ad5a6df34dead8da296b
Merge branch 'kk4.4' of https://github.com/nelo360/packages_apps_Settings into kk4.4

Conflicts:
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/accessibility/AccessibilitySettings.java

Change-Id: I4527f413cc0f342b9a552f8b70c705321262fc84