Merge "filesystem_config: Add a aid/uid for UWB subsystem"