Merge "Make MmsManager public"
am: b93ab62135

Change-Id: Ie69ad213897098e37944b08dd58e51a1a0c528b8