Revert "Mms: Merge Mms fix"

This reverts commit e5e34f930d82455dddffeef6581d3b6634807ec4.

Conflicts:
	src/com/android/mms/transaction/MessagingNotification.java

Change-Id: I54857dc8433317fb845226811786664fa18b28df