Merge "Allow shell access on /dev/uhid node"
am: 216b377d78

Change-Id: I2ff6397f145424266cd1091e338323cff283397c