Reland "Merge pull request #16656 from Rik/telephony-promise-969280"

This reverts commit 548965a5866aa38b5f44c336b3a7fb723164e277.
Remove broken test until rik has a chance to investigate in bug 969280 r=rik
Merge branch 'master' of github.com:mozilla-b2g/gaia