Merge "CarrierMessagingService: Add new enum values for granular errors" into main