Merge "Rename SmsAppService to CarrierMessagingClientService"