Call close on Cursors in finally blocks.
Call close on Cursors in finally blocks.

Fix for http://b/issue?id=2511581

Also call delete instead of deleteHistoryWhere, since we are only
considering non bookmarks anyway.

Change-Id: I00c052db3d27d61592688e7a160e721d5f82b210

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base