GM reworking mandatory OnStar plans for some 2024 models