[automerger skipped] Merge "Fix NPE for CdmaSmsMessage initialization" into...

[automerger skipped] Merge "Fix NPE for CdmaSmsMessage initialization" into tm-dev am: c54fadb9 am: b6dd2953 -s ours

am skip reason: Merged-In If41377a158bee9bed422c7a55ccb93e49e8b5dfc with SHA-1 db6061a6 is already in history

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



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