telephony: Remove CdmaLteUicc and CDMA fix

- CDMALTEPhone/CDMAPhone - remove the Uicc objects for updateCurrentCarrierInProvider and getSubscriberID
  Brings in line with commit https://github.com/CyanogenMod/android_frameworks_opt_telephony/commit/e287feac673ff68565b766e0e463d105fa9cef9d

Change-Id: I83be68398a502cd64b5688164a0c4f11771d896e

Conflicts:
	src/java/com/android/internal/telephony/cdma/CDMAPhone.java