Merge tag 'android-4.4.1_r1' into HEAD

Android 4.4.1 Release 1

Conflicts:
	src/com/android/phone/CallModeler.java
	src/com/android/phone/MobileNetworkSettings.java
	src/com/android/phone/NotificationMgr.java

Change-Id: Ifa90a007ca3cad9a2fb018a2f09da2cc2e1168d2

Conflicts:

	src/com/android/phone/NotificationMgr.java