[automerger skipped] Merge "Create @SystemApi CarrierMessagingServiceWrapper." am: 4ae457ad9d am: 41f6ef08ba
am: 55c51a846a -s ours
am skip reason: change_id I67fda8bab3902b358c483f992633dbdfe3a8cda2 with SHA1 92642659e8 is in history

Change-Id: I48845ee7ca05ea008e5e9366d2a27f5145ee0a77