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

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

Change-Id: I8ffe35c06d1bdb2f70709927b97c1677ed419456