TeleService: Fix for NPE removing preference

Change-Id: I741ff526de454761b8cb1fa105bf4dc52fa20bdc

Conflicts:
	src/com/android/phone/CallFeaturesSetting.java
bugfix: deal with non-contact file being opened as contact file

Change-Id: I947aae321347b347e7437625fc517d3004591979