Merge "Restructure CarrierMessagingServiceWrapper with better interfaces." into rvc-qpr-dev-plus-aosp