Merge "inputdevices: update from aosp (master)"