Merge "Sort user restriction constants and add the missing `DISALLOW_CONFIG_DEFAULT_APPS`." into main