Merge "Fix subtype count unit test due to Ic7c17d9656"

@SmallTest

public class KeyboardLayoutSetSubtypesCountTests extends KeyboardLayoutSetTestsBase {

    private static final int NUMBER_OF_SUBTYPES = 66;

    private static final int NUMBER_OF_SUBTYPES = 67;

    private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 42;

    private static final int NUMBER_OF_PREDEFINED_ADDITIONAL_SUBTYPES = 2;