Revert "Stop marking gamepads as keyboards"

This reverts commit 74c8fb601ef75d8e12df5221489c41c125e3b846.

Change-Id: If8ca4d09b4d52f11d48dabebf2dff2984760cdc0
bug: 8896129
Merge branch 'jb4.3' of github.com:BelieveROM/frameworks_base into jb4.3