Make going to call log after call optional.

PS2 - Delete .xml~ file
PS3 - For real this time

Change-Id: I25a7980c8eb31bc83f67a23d72749fa3583f108f

Conflicts:

	res/values/strings.xml
	res/xml/call_feature_setting.xml
	src/com/android/phone/PhoneUtils.java
missed it