Finish HSPAP network support
Add support for DCHSPAP networks

Conflicts:
	core/java/android/os/BatteryStats.java
	core/java/com/android/internal/os/BatteryStatsImpl.java
	telephony/java/android/telephony/NeighboringCellInfo.java