move Ring Delay option to Advanced settings

Conflicts:
	res/xml/call_feature_setting.xml

Change-Id: I6ca9165e5a7d4772d665c0266adc0ac19aedfd9e
Add option to mark user-rejected calls as missed - CM

This patch adds an opportunity to mark user-rejected calls
as "missed" rather than "incoming" in call log. Option is
useful for regions where voicemail is not quite widespread
and for users who need reminders about previously rejected
calls.

Change-Id: I14a9792591f511ef4da2d1f7a3b115aa8d5998cf

Conflicts:
	res/values/strings.xml
	res/xml/call_feature_setting.xml

Conflicts:
	src/com/android/phone/PhoneUtils.java
Phone: Allow voicemail notifications to be dismissed - CM

Change-Id: I1ce0d75d8a47b580034a6804ba30cbb7647cba69

Conflicts:
	src/com/android/phone/NotificationMgr.java