Merge "Add a comment for setAdditionalInputMethodSubtypes"