Merge "inputdevices: update from aosp (master)" into cm-11.0
(cherry picked from commit 831179d557abe295be7c0d11d4ba10bfef885860)