Merge "Delete newFromCMT() and newFromCDS() from SmsMessage" am: b599edc541 am: b403b0877d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359205

Change-Id: I05e4806aca68c0b42912834a6da1976443846c56