[automerger skipped] Merge "Move mms related code from opt/telephony to...
[automerger skipped] Merge "Move mms related code from opt/telephony to base/telephony." am: ee09b98d am: 404560d8
am: f10adb17 -s ours
am skip reason: change_id Ia276a49ae09476e9980a366a02057c08185ce1ca with SHA1 0748dc3f is in history
Change-Id: Id3f8fc51ffe1f8e0c9c2fc35a0fae241f2d9a526