[automerger skipped] Merge "Hide CarrierMessagingServiceWrapper for now." am: 796d96ed05 am: 6ae341666f -s ours am: 38b5ac44c1 -s ours
am skip reason: Change-Id Icb65f90261ea6000aecd72a1888d5ee23eed6527 with SHA-1 e75a35d3b3 is in history
Change-Id: I88f6e1e185241036d5dffecbc02c9560b8c2611e
This commit is contained in: