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: f4def1d7

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



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