Telephony: GSM: remove 'Carrier Settings' regardless of csp_enabled

Carrier Settings should be removed when config_carrier_settings_enable
is false. csp_enabled has nothing to do with it.

Fixes "Carrier Settings" appearing and crashing when the user clicks
on it.

Change-Id: I31c508f2353eb15a096aa279e71c4be4ce89abb8
Merge remote-tracking branch 'aospal/lollipop' into L
Revert "Proper supplementary service notification handling (4/5)."

This reverts commit 4ed6bfb691178f9b103e74160039da74b1c53e5a.