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

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

Change-Id: I298b098bb2b364973aa4dd542c26725b8906a218