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

Merge "Fix resource leakage caused by cursor" am: 662ba59a am: 381ac521 am: 2ccf9d95 am: 8bae3a88

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



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