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

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

Change-Id: I75db1c3f51c42299f9997acf03f5092c1a48c719