Merge pull request #8107 from ferjm/bug838622

Bug 838622 - [Dialer] USSD unit tests are failing; r=arcturus(cherry picked from commit 362518d356ca32b40c2fbbcc26d48e679e34fd97)