Fix a Cursor leak

When cursor is done, the cursor must be closed to avoid cursor leak.

Change-Id: I627cf2c8a64a220d6fd104505b852daca0928190
Fix a Cursor leak

When cursor is done, the cursor must be closed to avoid cursor leak.

Change-Id: I05181f426e7c2f21722838b1297591f0cf556495

Conflicts:
	src/com/android/phone/CallFeaturesSetting.java
Phone: Fix waiting call answer issue

When hold and active call exists, to answer the new incoming call
 -hangupActiveCall() method alone is sufficient
 -Do not call answerCall() method, which is causing to switch
  the answered call to hold state.

Change-Id: Ia9825c24f68397cbc178a046342e4e6acae6e36c