[automerger skipped] Merge "Get MMS config through SmsManager" am: 52be231088 am: 024ccf3c90 am: 05ea4034ea -s ours
am skip reason: Change-Id I502bd4fdd3f7d0616bc66e303d7fe26fbe7be388 with SHA-1 48e637758d is in history

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