[automerger skipped] Use CarrierMessagingServiceWrapper. am: ce485b8f5f am: 20e050f2c3
am: b310a1a2d0 -s ours
am skip reason: change_id I06419b49df06c1771f50ea1e4580bd0fc141bba6 with SHA1 2f821cea93 is in history

Change-Id: I380dfb27a4aa7470538dd494bda6bd4212bdd8a1
tree: 5f1fee1627a33f3743252a93cd4ef8d71b012dc3
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. proguard.flags