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

Change-Id: Icc061e9ac4a14f9ed122f166de19d5b4cafca6d2