Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev am: 2d3f5ecd4a am: e4cda91ccd am: 78cd92a48e am: edc59dbe5b

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

Change-Id: Ice0be870f0e6f296d7268f0491bcc82d7da44efb