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

========

https://hg.mozilla.org/integration/gaia-2_0/rev/f38a718df6d0
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #22292 from gasolin/issue-1040406

Bug 1040406 - dismiss current permission dialog once attentionscreenshow..., r=alive

========

https://hg.mozilla.org/integration/gaia-2_0/rev/421fdf262a6b
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Revert "Merge pull request #22274 from sfoster/bug-1038630-tutorial-redux"

This reverts commit 86aeccd8e150b98e2b30e532b55ff32cba7649ea.

========

https://hg.mozilla.org/integration/gaia-2_0/rev/42b07b597901
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Merge pull request #21960 from asutherland/email-cookie-cache-fix-v13t

Bug 1008859 - [email] on language change, cached card templates not updated. r=jrburke a=blocking-b2g=v1.3t+ a=bajaj a=wchang

========

https://hg.mozilla.org/integration/gaia-2_0/rev/e1d051681475
Author: Sergi Mansilla <sergi.mansilla@gmail.com>
Desc: Merge pull request #22303 from sergi/BUG_1024893_v1.4

Bug 1024893 - [dolphin][v1.4]Entering settings app takes more than 2.2s - uplifting to 1.4 [r=yurenju] [r=arthurcc]
Conflicts:
	Makefile
Bumping manifests a=b2g-bump