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

Change-Id: Ic641ec756e7d482f9144aab6a3ffd5d94b94aeea