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

Change-Id: I654b7a4b46f7f0795c0e39d364392e247edb174f