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