Merge "Enforce BaseUserRestriction for DISALLOW_CONFIG_BRIGHTNESS" into main