Merge "Create a local CarrierMessagingServiceManager." am: ba71bb8762
am: 1c08ba2517

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