Merge "Add uhid group to system_server"
am: 3a49014ca0

Change-Id: I6e17ed44ba794f5ca4d3b0b165ee9be56ed26938