[automerger skipped] Merge "Move getMmsConfig from SmsManager to MmsService." am: 023d2d650b am: 86bb28e1b3
am: 9b3c4c1484 -s ours
am skip reason: change_id If0a4b319f23d1a01e98f64ed1ae6eb6b90ccb02a with SHA1 214f7ec7fa is in history

Change-Id: I3e09131d6b5d350626e00cc6d783c97e402c414b