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

========

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

Bug 1053641 - Remove newlines from localized strings describing call forwarding status r=drs

========

https://hg.mozilla.org/integration/gaia-2_1/rev/683a8a1a132a
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 1053641 - Remove newlines from localized strings describing call forwarding status r=drs

(cherry picked from commit c451052868e71c932311dae95d99857c5b368f49)

Conflicts:
	apps/communications/dialer/locales/dialer.en-US.properties
Bumping manifests a=b2g-bump