TeleService: Fix for NPE removing preference

Change-Id: I741ff526de454761b8cb1fa105bf4dc52fa20bdc
Merge remote-tracking branch 'cyanogen/cm-11.0' into cm-11.0