Telephony: GSM: fix removing 'Carrier Settings' again

Broken in I3d09d4beb7c2cf2e04d3c67beefff292ad28b4c2

Change-Id: Ia38bfe4d6b9e9546dc990325543205d6d85603a8
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0