Merge "Map the RAT included in ImsSmsMessage to RIL value correctly." am: d0412127b7

Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1378659

Change-Id: I1ff9abbb2e670ecb8840f3565c36f71a462239e0