Merge tag 'android-4.4.1_r1' into HEAD

Android 4.4.1 Release 1

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

Change-Id: I3494be9ac45ef0b6eeefdd1b0f6952242a81618e
(cherry picked from commit 553635e86c364c1126a1923316f6df488c4aed6c)