U+ SMS Patch

Conflicts:
	src/java/com/android/internal/telephony/cdma/sms/BearerData.java