[automerger skipped] Merge "Hide CarrierMessagingServiceWrapper for now." am:...
[automerger skipped] Merge "Hide CarrierMessagingServiceWrapper for now." am: 796d96ed am: 6ae34166 -s ours
am skip reason: Change-Id Icb65f90261ea6000aecd72a1888d5ee23eed6527 with SHA-1 e75a35d3 is in history
Change-Id: Ib1364d89158ae59af94e8933fe3ce8a644111280