Merge "Close cursor after DB operations." into udc-dev am: 4241a2b1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/22343526



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