Merge "Updating config files and system API to create roles for on-device system intelligence features" into sc-dev