Revert "Added support for DC-HSPA+"

This reverts commit 8ab9ec6e0e023454bae03fd77f786c11822cd10a.

Conflicts:
	telephony/java/android/telephony/ServiceState.java
	telephony/java/android/telephony/TelephonyManager.java

Change-Id: Ifd5fb75e94589909bf57be5486accc69df6f2deb