[automerger skipped] Merge "Create @SystemApi wrapper for ICarrierMessagingService." am: 12efda4c am: c725da05
am: 2c540d4e -s ours
am skip reason: change_id I02ea608dc66f637f9dc984f4dcd8346fcc4b80ce with SHA1 86989efe is in history
Change-Id: I125a1af23c4a014a94858185156598cfc84b2903