Merge pull request #14578 from gitmai/bug-948824-CC-remove-icchelper

Bug 948824 - [CostControl] [DSDS] Remove IccHelper
r=salva
(cherry picked from commit 33e4a0f4e242b54c91eb8a1f5f91efada5252565)
Merge pull request #15654 from jaoo/962453

Bug 962453 - [DSDS] Once visit APN setting of one SIM, same APN of another SIM will be changed to "Custom". r=arthurcc(cherry picked from commit 4d0b2ffaf044a20b5bea9d7d85d4ecc5a71080fd)

Conflicts:
	apps/settings/elements/carrier_data_settings.html
	apps/settings/elements/carrier_mms_settings.html
	apps/settings/elements/carrier_supl_settings.html
Bug 963173 - Ensure address bar is always displayed when a different tab is selected. r=daleharvey
(cherry picked from commit ac0692fcd9bc59508dc978591cc380f8dcdc7873)