Merge remote-tracking branch 'cm11/cm-11.0' into kk-4.4

Signed-off-by: baked <travp624@gmail.com>

Conflicts:
	src/com/android/phone/MSimPhoneGlobals.java
	src/com/android/phone/PhoneInterfaceManager.java