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

Change-Id: Idd93924c99741745545e073eb652676d6b3bc45c