Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev am: 2d3f5ecd4a am: 826e63f47a am: 490cf9c1c3

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

Change-Id: I4692b5d64839838682989d0f349b70b63e49dc3d