Telephony : Update reference to Apn Settings

Related to : http://review.cyanogenmod.org/54910

Forward port from cm-10.2 Phone app, adjusted for 4.4

Change-Id: I2bdfc346815115bb19ba469a61ccca9ae4e036dd
[2/3] Telephony: allow disabling non intrusive incall ui

Change-Id: I54c07211dc121117543ccb8a4799efa491e5a469
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	src/com/android/phone/CallFeaturesSetting.java
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_packages_services_Telephony into kk44