Merge "inputflinger: Rework previous fix for KCM" into main

    if (hasKeycodeInternalLocked(keycode)) {

        return true;

    }

    // Check the key character map first. Not all input devices will have one.

    const std::shared_ptr<KeyCharacterMap> kcm = getKeyCharacterMap();

    if (kcm == nullptr) {

    if (!keyMap.haveKeyCharacterMap()) {

        return false;

    }

    for (auto& fromKey : kcm->findKeyCodesMappedToKeyCode(keycode)) {

    for (auto& fromKey : getKeyCharacterMap()->findKeyCodesMappedToKeyCode(keycode)) {

        if (hasKeycodeInternalLocked(fromKey)) {

            return true;

        }