[automerger skipped] Merge "Make MmsManager public and @SystemService" am: 01574a30ea am: f6cdbeb470 -s ours
am skip reason: Change-Id I39cde852252e18f71f98e328354df66611c9db60 with SHA-1 4affb51cc9 is in history

Change-Id: I0e8d4434a5dde36ea8be6a61960fd598f3aa894e