[automerger skipped] Merge "Make MmsManager public and @SystemService" am:...
[automerger skipped] Merge "Make MmsManager public and @SystemService" am: 01574a30 am: f6cdbeb4 -s ours am: 0d399d38 -s ours
am skip reason: Change-Id I39cde852252e18f71f98e328354df66611c9db60 with SHA-1 4affb51c is in history
Change-Id: I92d2bbaba98af2b466f1705761c819bf88100293