Merge tag 'android-4.4.1_r1' of https://android.googlesource.com/platform/frameworks/opt/telephony into kk4.4

Android 4.4.1 Release 1

Conflicts:
	src/java/com/android/internal/telephony/RIL.java