Merge "SMS service loads MMS config directly instead"
am: 250a41a139

Change-Id: If563ce6935b844a9747c6544c67f1988d64e0e4e