Merge "Add additional field into sms atoms for satellite service" into 24D1-dev