Merge "Deprecate InputMethodManager#setAdditionalInputMethodSubtypes()"