Merge "Fix resource leakage caused by cursor" am: 662ba59a am: 381ac521

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608471



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