Merge "Move mms related code from opt/telephony to base/telephony."
am: 1cc8ffdf8c

Change-Id: I040fe6cda94c7a5f008e8eb6aa8d8ab137632f0d