telephony: Fix package name warnings

Change-Id: Id229351301d16c687c0d19d19d417c19326bc89c
Telephony: fix MSim package names

Broke in a4ae7bacf1ec564343540f3687505f3911796946

Change-Id: I77072846a3db561521cca8bbb5e8b9e20dcc3232
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 pull request #1 from CyanogenMod/cm-12.0

1