Merge "Fix null gsm/cdma message in sendImsSms" am: cea6af1f am: 307f8a02...

Merge "Fix null gsm/cdma message in sendImsSms" am: cea6af1f am: 307f8a02 am: 4f12f005 am: d1d4cafe am: 87eea9fe am: d87ff913

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



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