Merge "[automerger skipped] Merge "Move mms related code from opt/telephony to base/telephony." am: 1cc8ffdf8c am: b6fe8224fc am: f8984396d5 -s ours am skip reason: change_id I03eda5a5dbd003659a90e2b9f6be9d4c2b767add with SHA1 fda8bc058c is in history"