Prevent cursor from causing global reference leaks.

To fix this the ContentQueryMap needs to be closed
when onStop is called so any global references can
be reclaimed.

Change-Id: I0c679c10b0d75ab0aac2fe499563c57d934e318a
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1