am 332a85f9: am 364a7d1c: (-s ours) am bc71d036: (-s ours) am 3e46ead6: (-s ours) am c2711274: Add tests for InputMethodSubtype. DO NOT MERGE

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