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

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



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