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

========

https://hg.mozilla.org/integration/gaia-central/rev/ac1688a759ef
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #17835 from snowmantw/issue937442-lockscreen-window

Bug 937442 - (lockscreen-window) [Window Management] Implement LockscreenWindow to manage LockScreen.

========

https://hg.mozilla.org/integration/gaia-central/rev/8904d6ddabb5
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 937442 - (lockscreen-window) [Window Management] Implement LockscreenWindow to manage LockScreen.

Conflicts:
	apps/system/js/lockscreen.js
	apps/system/test/unit/bootstrap_test.js
	tests/python/gaia-ui-tests/gaiatest/tests/functional/lockscreen/test_lockscreen_unlock_to_emergency_call_screen.py

========

https://hg.mozilla.org/integration/gaia-central/rev/b26c35814abb
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Merge pull request #16398 from dominickuo/bug-973831

Bug 973831 - [Music] also check MusicComms.enabled when checking SCO status, r=jimporter

========

https://hg.mozilla.org/integration/gaia-central/rev/ecf33f47a878
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Bug 973831 - [Music] also check MusicComms.enabled when checking SCO status

========

https://hg.mozilla.org/integration/gaia-central/rev/2150f52fb943
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 990334 - [Calendar] Disable marionette test, marionette/today_test.js

========

https://hg.mozilla.org/integration/gaia-central/rev/39c0034a675e
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Merge pull request #17833 from wilsonpage/bug/990285

Bug 990285 - [Camera] Resolutions should not be shown in settings menu

========

https://hg.mozilla.org/integration/gaia-central/rev/b81c06accee9
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 990285 - [Camera] Resolutions should not be shown in settings menu
Bumping manifests a=b2g-bump