Merge "Revert "Make MmsManager public"" am: 393af8c53c am: 685a0ab43b

Change-Id: I64d9e9a55f8124bdfe8bcd7aba8e8f74a42b0051