[automerger skipped] Merge "Telephony: Add 7bit Ascii support for long message" am: 76bc8cf927 am: abbb73a70a
am: f9fdd303e8 -s ours
am skip reason: change_id I7c2cd91d0aef0d6436d250544db9bf2131e35075 with SHA1 6de48e4a86 is in history

Change-Id: Ia1aa0e5e91a1e2b086794e9ae81899015eaa49a5