Merge "frameworks/base: fix Logitech Dual Action gamepad"