[automerger skipped] Fix Sms7BitEncodingTranslatorTest to build am: 71098c19 -s ours
am: c9eb910a -s ours
am skip reason: change_id Idaa0ef12da7c07dbd2808a914d714f96a89b2319 with SHA1 46131ee6 is in history
Change-Id: I6a5676369b0b0430bb2f388e0adb94641907de41