Merge tag 'android-4.4.1_r1' into HEAD

Android 4.4.1 Release 1

Conflicts:
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/Settings.java

Change-Id: Id7de234388ba9e9b4223ddab900a335424207b2f

Conflicts:

	src/com/android/settings/DisplaySettings.java