Merge "Make MmsManager public and @SystemService" am: 01574a30ea

Change-Id: I6978fb1377f76308732fb241f04adcef82087b7f