Merge "Fix KeyboardLayoutSetSubtypesCountTests."

@SmallTest

public class KeyboardLayoutSetSubtypesCountTests extends KeyboardLayoutSetTestsBase {

    private static final int NUMBER_OF_SUBTYPES = 84;

    private static final int NUMBER_OF_SUBTYPES = 82;

    private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 50;

    private static final int NUMBER_OF_PREDEFINED_ADDITIONAL_SUBTYPES = 2;