Merge "Delete newFromCMT() and newFromCDS() from SmsMessage" am: b599edc541 am: b403b0877d am: 5850cbdfad am: 57c6c1b17c

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

Change-Id: I30cf7dfd7a7039d8b05be60c365431bdee802b3e