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

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

Change-Id: Icb198229a6950e50338b2455909d8e1b6852c3a2