am 91a0a2d2: (-s ours) am c369fe3e: (-s ours) Merge "Add tests for InputMethodSubtype. DO NOT MERGE" into jb-mr1-dev

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