Revert "TelephonyManager: hide NETWORK_TYPE_DCHSPAP"

This reverts commit 0803690e03c5f4ec070da9e7389a7411920460ec.
Revert "Frameworks & SystemUI - additional DC-HSPAP support"

This reverts commit ba5d6135cfa1e5efccbb64b37eb495134af5ad7d.
Merge fix

Change-Id: I39e10cac17bca04666dcd890d34b72ba7d18337e