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

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



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