[automerger skipped] Merge "Fix Sms7BitEncodingTranslatorTest to build" into qt-dev
am: 4e451042 -s ours
am skip reason: change_id Idaa0ef12da7c07dbd2808a914d714f96a89b2319 with SHA1 46131ee6 is in history
Change-Id: I526d1173568d7df27c84ef8f848f781158997c7d