am ec0d6bb9: Merge "Move current subtype management code to RichInputMethodManager"

* commit 'ec0d6bb9b708070c71981021712dfad0352a4cfe':
  Move current subtype management code to RichInputMethodManager