Merge "Fix a lint error in getSortedInputMethodAndSubtypeList()" into main