Telephony(MSIM): Allow enabling call recording

Conflicts:
	res/xml/msim_call_feature_setting.xml
	src/com/android/phone/MSimCallFeaturesSetting.java

Change-Id: I9fd1ec8c9c0aab9f91371e69dee7d40661cf8ce2
Telephony: Allow enabling call recording (3/3)

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

Change-Id: I33fdfd8acff85901076757b60a877799be629948
Merge "Telephony(MSIM): Allow enabling call recording" into kk
Merge remote-tracking branch 'carbon/kk' into kk