Merge "Add uhid group to system_server" am: 3a49014ca0 am: 5cfc2c3e7f
am: 5f703ccf7b

Change-Id: I178c85cbc78ddf8c95e89b23933b0a51461d4728