Merge pull request #10974 from t895/permissions-fix Android: Prevent app lockup when revoking write access
