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

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



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