[automerger skipped] Merge "Keep order for multi-part SMS when retry from...

[automerger skipped] Merge "Keep order for multi-part SMS when retry from CarrierMessagingService" am: 6cdb680b am: 71d01595 -s ours am: df6a6bf8 -s ours

am skip reason: Change-Id I5421136720d5ef0a96b1add8b24dd7b351ffe799 with SHA-1 c1e103aa is in history

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

Change-Id: I2ce2b93b70eacc0c72bf75e1b02cab6aaff143f4