Merge "Skip updating the process group of system_server" into sc-dev