Bumping gaia.json for 3 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_1/rev/bcc74dc8ad48
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #25900 from gabrielesvelto/bug-834530-v2.1-uplift

Bug 834530 - Make the TonePlayer handle the channel sounds will be played on r=drs

========

https://hg.mozilla.org/integration/gaia-2_1/rev/1ce6f2b1ef51
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 1092362 - Use the default audio channel when playing audible tones outside of calls r=drs,francisco

(cherry picked from commit e327daf01fac1e5fbe2ba732c26e3a21db32443a)

========

https://hg.mozilla.org/integration/gaia-2_1/rev/e90660f103d2
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 834530 - Make the TonePlayer handle the channel sounds will be played on r=drs

(cherry picked from commit 20a56c3cf6ea6b730d05d7a8cfa06e178cd5717c)

Conflicts:
	apps/callscreen/js/index.js
	apps/communications/dialer/js/dialer.js
	apps/communications/dialer/test/unit/tone_player_test.js
	apps/emergency-call/js/dialer.js
	apps/emergency-call/js/keypad.js
	apps/emergency-call/test/unit/keypad_test.js
	apps/sharedtest/test/unit/dialer/telephony_messages_test.js
	build/jshint/xfail.list
	shared/js/dialer/keypad.js
	shared/js/dialer/telephony_messages.js
	shared/js/dialer/tone_player.js
	shared/test/unit/mocks/dialer/mock_calls_handler.js
Bumping manifests a=b2g-bump