Merge "Make MmsManager public" am: b93ab62135 am: 4fbe9dd076

Change-Id: Icf438f6d3ff46655beae6c71aef06343bff13186