[automerger skipped] Merge "Move MmsManager and IMms to frameworks/base/mms"...
[automerger skipped] Merge "Move MmsManager and IMms to frameworks/base/mms" am: c7f1b38d am: 69d16fe2
am: caf96240 -s ours
am skip reason: change_id Ib2cffce98f62913c3e50c59b63012c39d595d9ce with SHA1 6237a6b3 is in history
Change-Id: Icc6ad8645b397945dba0f55a3e044e177509c5ce