Merge "Fix NPE for CdmaSmsMessage initialization" am: 57cd609d am:...

Merge "Fix NPE for CdmaSmsMessage initialization" am: 57cd609d am: cf714720 am: 0f2fe7e9 am: f32fa91a am: 6001e288

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



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