Cleanup
Telephony: Allow enabling call recording (3/3)

Change-Id: If965a4e2f2d943f866a7aa14503008dd9f234450

Conflicts:
	res/values/cm_strings.xml
	res/xml/call_feature_setting.xml
	src/com/android/phone/CallFeaturesSetting.java