am 900502f1: Merge "Make RichInputMethodSubtype non-final for easy mocking"

* commit '900502f1ec0cb66bf27ed59ecccbfd1b44ddd635':
  Make RichInputMethodSubtype non-final for easy mocking