Merge "Remove a special rule from setAdditionalInputMethodSubtypes()" into main