[automerger skipped] Merge "SMS service loads MMS config directly instead" am: 250a41a139 am: e93312767b am: af1eb246ef -s ours
am skip reason: Change-Id Idc21015cab2902bd0f67e2131ea89b04c4fc4f5e with SHA-1 44fb1904e3 is in history

Change-Id: I16d1d8f8306bca1d74baebceb695008247fbfc91