Merge "Add test for InputMethodSubtypePreference"