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

Change-Id: Ic089fbe4e4108bc727b2583122f1328e4e174672