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

[automerger skipped] Merge "Fix NPE for CdmaSmsMessage initialization" into tm-dev am: c54fadb9 am: 9e6cfe82 am: f4d8c265 -s ours am: 4852fb70 -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: I0d066fe2bca0a0774a8d868de3f8cb1bbf9b9b39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>