Merge "Merge "Make sure to close cursors" into android14-dev am: 630bda3e84" into android14-prebuilt-test