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

Change-Id: Ibd92ecccd7410d755acf2a4ebd4a09622317226c