Merge "Add simple InputMethodSubtypeTest"