[automerger skipped] Merge "Create a local CarrierMessagingServiceManager." am: ba71bb8762 am: 1c08ba2517
am: ae1bfebaac -s ours
am skip reason: change_id I811acdf0d0b94dc5ec2a9c56d5153f06cd5bb258 with SHA1 7dd6ca170d is in history

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