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

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

========

https://hg.mozilla.org/integration/gaia-2_1/rev/cf0632881f84
Author: Sean Lee <weilonge@gmail.com>
Desc: Merge pull request #28303 from weilonge/seanlee/STK/v2.1/Bug1127730

Bug 1127730 - Add icc_events_test.js

========

https://hg.mozilla.org/integration/gaia-2_1/rev/492a9414fd79
Author: Sean Lee <selee@mozilla.com>
Desc: Bug 1127730 - Add icc_events_test.js
In this unit test, we focus how each STK setup events work and their
correctness. Here is the list of the events should be tested:
  STK_EVENT_TYPE_MT_CALL
  STK_EVENT_TYPE_CALL_CONNECTED
  STK_EVENT_TYPE_CALL_DISCONNECTED
  STK_EVENT_TYPE_LOCATION_STATUS - STK_SERVICE_STATE_NORMAL
  STK_EVENT_TYPE_LOCATION_STATUS - STK_SERVICE_STATE_LIMITED
  STK_EVENT_TYPE_USER_ACTIVITY
  STK_EVENT_TYPE_IDLE_SCREEN_AVAILABLE
  STK_EVENT_TYPE_LANGUAGE_SELECTION
  STK_EVENT_TYPE_BROWSER_TERMINATION

Conflicts:
	apps/system/test/unit/mock_system_icc.js