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

Change-Id: I63649dd5951be990d8404f3bbc53f4ece26cf030