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

========

https://hg.mozilla.org/integration/gaia-2_0/rev/a5d1b856518f
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #20924 from crh0716/1022992_v2.0

Bug 1022992 - Always show Find My Device's enabled state in the root Settings menu. r=arthurcc

========

https://hg.mozilla.org/integration/gaia-2_0/rev/1d9a90acc39d
Author: Guilherme Goncalves <guilherme.p.gonc@gmail.com>
Desc: Bug 1022992 - Always show Find My Device's enabled state in the root Settings menu.

Conflicts:
	apps/settings/js/findmydevice.js
	apps/settings/js/panels/root/panel.js
Bumping manifests a=b2g-bump