Merge "Permissions for /dev/uinput"
am: 9f96cc20a2

Change-Id: Ibf0daedb8369759e409feae16cb076a35938bef9