Compilation error fixes

- Compilation fixes.

Conflicts:
	src/java/android/telephony/SmsManager.java
	src/java/com/android/internal/telephony/PhoneBase.java
	src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java
	src/java/com/android/internal/telephony/dataconnection/DcTracker.java
	src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java

Conflicts:
	src/java/com/android/internal/telephony/ModemStackController.java
	src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
	src/java/com/android/internal/telephony/dataconnection/DctController.java

Change-Id: I20528f34d1baac9a57fd8887e61dd628edde1a3a