Merge "Make RichInputMethodSubtype non-final for easy mocking"