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

========

https://hg.mozilla.org/integration/gaia-central/rev/fde9b4569492
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #17445 from rnowm/986466

Bug 986466 - [VDR] Incorrect use of edit mode [BB]

========

https://hg.mozilla.org/integration/gaia-central/rev/208b5cf7e0b2
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 986466 - [VDR] Incorrect use of edit mode [BB]
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/315b9974356f
Author: Arthur Chen <crh0716@gmail.com>
Desc: Revert "Bug 964180 - Introduce AMD to settings app"

This reverts commit d9fb81e2d83dae21e53496b697cdd10ad6a2d4fd.

Conflicts:
	apps/communications/dialer/test/unit/multi_sim_action_button_test.js
	apps/settings/index.html

========

https://hg.mozilla.org/integration/gaia-central/rev/1bd507e97ee3
Author: Arthur Chen <crh0716@gmail.com>
Desc: Revert "Bug 985409 -  Fix JSHint issues with test/unit/setup.js"

This reverts commit 5d3e2618af85aa245e4bc06692b9d5df32687745.
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/4dff379346b2
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #17373 from crh0716/985090

Bug 985090 - Fix voicemail number migration issue and refactor r=jaoo

========

https://hg.mozilla.org/integration/gaia-central/rev/4170f2f3c3e9
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 985090 - Fix voicemail number migration issue and refactor
Bumping manifests a=b2g-bump
Bug 949537 - Setup substring matching for Chilean numbers. r=gwagner
Merge m-c to b-i
Bug 983845 follow-up: Move the header to content/base and enable BrowserFeedWriter for xulrunner as well
Bug 986885 - Fix build problem in fmp4/demuxer. r=nalexander
Bug 986404:  Disable fade-out of overlay scrollbars during reftest.  r=mstange
Bug 986404 - Mark test as failing due to scrollbars showing up.
Merge f-t to m-c
Merge b-i to m-c
Merge m-c to f-t