[automerger skipped] Merge "Populate the correct format in ImsSmsMessage." am:...

[automerger skipped] Merge "Populate the correct format in ImsSmsMessage." am: 3bbc72c2 am: 0278312a am: b4dddd49 am: 02e3b9ae am: 942902a4 -s ours

am skip reason: Change-Id I34c7de58736901e2e9d1d1815f9e5b617f0e2c94 with SHA-1 8f5c2e85 is in history

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

Change-Id: I28b49d72ed689c9013629d10b98fb2a43576533a