Revert "Frameworks & SystemUI - additional DC-HSPAP support"

This reverts commit dc8bf3a7ad74aadb071405266012b9561fec0d86.

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

Change-Id: Idb6eff69f498ae6f9931ffba7bbd16f923dce5b5