Merge "Add uhid group to system_server"