am fda4733a: am d7c22694: Merge "Add tests for InputMethodSubtype. DO NOT MERGE" into jb-mr1.1-dev

* commit 'fda4733aa7e2e685d1a56344cca63b1b16f96833':
  Add tests for InputMethodSubtype. DO NOT MERGE