Merge "Support CarrierMessagingService binding for HSUM" into main