Merge "Make sure to close cursors" into main am: a3c215a1e5

Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2361131

Change-Id: I5479c56f3b16e3509ca50ed7e275d5235ba84b85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>