Merge tag 'android-4.4.1_r1' into kk4.4

Android 4.4.1 Release 1

Conflicts:
	res/values/strings.xml
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/SecuritySettings.java