Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_frameworks_opt_telephony into cm-11.0

Conflicts:
	src/java/android/provider/Telephony.java
	src/java/com/android/internal/telephony/BaseCommands.java
	src/java/com/android/internal/telephony/CallManager.java
	src/java/com/android/internal/telephony/CommandsInterface.java
	src/java/com/android/internal/telephony/IccSmsInterfaceManager.java
	src/java/com/android/internal/telephony/IccSmsInterfaceManagerProxy.java
	src/java/com/android/internal/telephony/InboundSmsHandler.java
	src/java/com/android/internal/telephony/PhoneProxy.java
	src/java/com/android/internal/telephony/QualcommSharedRIL.java
	src/java/com/android/internal/telephony/RIL.java
	src/java/com/android/internal/telephony/SMSDispatcher.java
	src/java/com/android/internal/telephony/SamsungCDMAv6RIL.java
	src/java/com/android/internal/telephony/SamsungExynos3RIL.java
	src/java/com/android/internal/telephony/SamsungExynos4RIL.java
	src/java/com/android/internal/telephony/SamsungQualcommRIL.java
	src/java/com/android/internal/telephony/cat/CatService.java
	src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
	src/java/com/android/internal/telephony/dataconnection/ApnContext.java
	src/java/com/android/internal/telephony/dataconnection/DataConnection.java
	src/java/com/android/internal/telephony/dataconnection/DcTracker.java
	src/java/com/android/internal/telephony/gsm/GSMPhone.java
	src/java/com/android/internal/telephony/gsm/GsmCallTracker.java
	src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java