Merge tag 'android-4.4_r1.1' into HEAD

Android 4.4 Release 1.1

Conflicts:
	core/java/com/android/internal/util/slim/DeviceUtils.java
	telephony/java/android/telephony/TelephonyManager.java
	telephony/java/com/android/internal/telephony/ITelephony.aidl