Merge "Move the handling of carrier app changes in AppRestrictionController" into 24D1-dev