Merge pull request #11819 from JosJuice/android-input-device-null ControllerInterface/Android: Use InputEvent.getDeviceId
