Merge "Merge "Merge "SQLiteCursor must be closed before throwing exception"...

Merge "Merge "Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev am: 2d3f5ecd am: 826e63f4" into rvc-d1-dev-plus-aosp am: 8fea5708" into rvc-qpr-dev-plus-aosp am: 94d45c48

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

Change-Id: I16e9ce1d8f37356a9453a1a992cae5c7b3caf1b7