Merge "Enable subtypes when the implicitly enabled subtype is not ascii capable keyboard Bug: 5806103"