Merge "Fix NPE for CdmaSmsMessage initialization" into tm-dev am: c54fadb9 am: 659f5196

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/18237262



Change-Id: I61bbf0320aab0165c3cd5a9e699115078ae0f740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>